Commit Graph

5034 Commits

Author SHA1 Message Date
Cheridan f0003cd7d4 Merge pull request #9385 from optimumtact/forkingfantastic
Fork eating no longer requires mouth zone sel
2015-05-08 15:51:43 -05:00
phil235 489d076de5 Merge pull request #9126 from Jordie0608/doesrussellsteapotapplytorussellsteapot
Fixes #9035, atmos locker sprite and misc logging bug
2015-05-08 16:24:21 +02:00
Jordie e71106ad13 Merge pull request #9289 from Xhuis/now_he's_poorly_from_too_much_electric
Adds a second functionality to the emagged defibrillator
2015-05-08 22:10:49 +10:00
Jordie c9b804f6f6 Merge pull request #9256 from astralenigma/cradesbypaprka
Crates are mailed with manifests taped to the outside by paprka Merge Conflict resolution
2015-05-08 22:10:35 +10:00
Cheridan d28cd28426 Merge pull request #9315 from kingofkosmos/attackmsgfix
Removes unnecessary attack-messages
2015-05-06 22:34:30 -05:00
oranges 58c460a361 Fork eating no longer requires mouth zone sel
Instead, if there is a fork load you will simply eat the fork load.
2015-05-07 15:13:06 +12:00
Nienhaus 5812e63b4a Merge pull request #9313 from xxalpha/barsign
"The Net" barsign
2015-05-06 16:18:31 -05:00
Cheridan 46b2fe33af Merge pull request #9291 from Ikarrus/gangmind
Gang Update
2015-05-06 10:04:26 -05:00
Cheridan 95d7af4e48 Merge pull request #9277 from Ikarrus/ertbaton
Batons for Light ERP
2015-05-06 09:03:55 -05:00
Cheridan f49fbf1efc Merge pull request #9303 from RemieRichards/ExperimentalPerfomancetest
Explosion Performance Upgrades
2015-05-06 09:00:42 -05:00
Cheridan f11122c255 Merge pull request #9338 from optimumtact/framingrage
Change machine frames and girders deconstruction step
2015-05-05 21:38:02 -05:00
oranges 4ac3497ebe Change machine frames and girders deconstruction step
They now use the screwdriver instead of the welding tool

On top of that I added a check to ensure you can't disassemble the same girder
more than once to farm materials
2015-05-05 10:32:57 +12:00
Cheridan dfaf90c79e Merge pull request #9264 from phil235/BundleFix6
a group of fixes.
2015-05-04 09:41:01 -05:00
Cheridan 5bbf2be174 Merge pull request #9233 from Firecage/Operatingcuffing
Allows you to buckle people to an operating table.
2015-05-04 09:15:41 -05:00
Cheridan 191e011c14 Merge pull request #9272 from phil235/BundleFix7
animal knockdown, nettle soup, defib, extinguisher fixes
2015-05-04 00:26:22 -05:00
Cheridan 78e25c3175 Merge pull request #9220 from RemieRichards/PlasmaaaaaaaMeeeeeeen
Ports VG's Plasmamen + Species breathing additions
2015-05-04 00:19:18 -05:00
kingofkosmos 8c1f6b1644 Mop span fix. 2015-05-04 05:57:31 +03:00
Ikarrus e4079cf923 Loyalty Implants and Gangsters
- Experiment: Loyalty implants will no longer survive deconverting a gangster. Security now needs to use two of them if they want the permanent effects: The first to deconvert them, and the second to make them loyal.
2015-05-03 19:36:13 -06:00
xxalpha c0c4f8f4b6 Barsign 2015-05-03 15:01:16 +01:00
Remie Richards e5f034fc0d Merge pull request #9147 from GunHog/Rise_Of_The_RR_Androids
[Review Ready] Positronic Brains!
2015-05-03 06:34:02 +01:00
Remie Richards 4caefd878e fixes an issue that could cause sub system cycles to work in decimals. 2015-05-03 04:54:57 +01:00
Remie Richards 2234a9b25e powernet datums now manually clear references, subsystem/proc/postpone() now takes an optional "cycles" argument, for postponing more than 1 cycle, Explosions are less laggy! 2015-05-03 04:39:48 +01:00
Xhuis ce49f52405 Lowers charge time 2015-05-02 21:27:54 -04:00
astralenigma 78fdf5e1f7 I think I'm done but I'm always wrong
Removed secure/new() due to it's current uselessness
Put all changes in the secure overlays inside the update icon
Found a bug where EMP act would only unlock the crate instead of
breaking it but would still apply the emag overlay I defaulted the fix
to breaking the crate.
Moved the variables from emag act and emp act upwards for compliance
with the update_icon() checks.
2015-05-02 21:37:33 +01:00
Xhuis 08053c0235 Makes the emagged defib more worthwhile 2015-05-02 14:17:05 -04:00
Jordie 3606662c88 Merge pull request #9106 from phil235/BundleFix5
Cyborgs, MMIs, and other fixes
2015-05-02 23:59:22 +10:00
Jordie 562766bdb0 Merge pull request #9129 from Incoming5643/begone_ye_jellies
Some Mutantrace Housekeeping
2015-05-02 23:59:15 +10:00
Jordie d1f55ec69a Merge pull request #9203 from Boggart/RpdUiFix
Fixes being unable to switch back to the previous pipe type without switching off it and back after using the delete or paint modes.
2015-05-02 23:58:55 +10:00
MrStonedOne eb7d5fefa5 Merge remote-tracking branch 'upstream/master' into step-aside-aran-im-here-to-touch-your-precious
Conflicts:
	code/controllers/subsystem/ticker.dm
2015-05-02 03:03:29 -07:00
Ikarrus b331391aa5 Batons for Light ERT
Moved the batons from the lockers to their backpacks so light ERTs can use them
2015-05-01 21:30:34 -06:00
astralenigma fe8e7f3f65 Moved the overlays.cut() per request. 2015-05-02 02:12:17 +01:00
phil235 be1708483e - Fixed nettle soup recipe says abstract nettle.
- Fixes hostile animals weakening non carbons, and adjusted weakening values 1958.
- fixes being able to drop defib paddle by resting, fix a runtime linked to this.
- can no longer pick card from deck while resting, same for paper bin and bedsheet bin.
- examining extinguisher and atmos watertank nozzle gives you the amount of water remaining.
2015-05-02 01:34:38 +02:00
Cheridan 0d1cfba3b7 Merge pull request #9200 from Ikarrus/ERTcodes
[Z2 MAP] Centcom Response Team Variations
2015-05-01 14:31:22 -05:00
Cheridan 2d021ab175 Merge pull request #9226 from Ikarrus/gang5.2
Gang Update
2015-05-01 13:00:51 -05:00
phil235 4a8e168ff3 - admin revive clears addiction list. 8894
- buffed capsaicin/frost oil temperature effects as well as basilisk temperature effect (to counterbalance the recent change in natural bodytemp stabilization). And slight nerf to ghost chili temp boost when held in hand (for consistency). 8501
- fixes religion name choice window labeled as mime name
- fixes nearly invincible larva 9223
- your health/status now updates immediately after taking damage, we don't wait for the next life(). 7031
- Fixes alien nest overlay not updating when dead mob is gibbed by larva exit. 8523
- fixes flamethrower tablecrafting. 9261
2015-05-01 19:45:36 +02:00
Cheridan 9e6b93ae6c Merge pull request #9219 from xxalpha/winter_is_coming
Fixed unlimited uses crayons not being unlimited.
2015-05-01 12:01:11 -05:00
astralenigma 8d72d9ef2b Second attempt at overlay
None of the crates appear with the manifesto outside, but he's there
waiting lurking in the shadows waiting to strike.
2015-05-01 08:01:54 +01:00
astralenigma 30b86c060f The manifest code is completed in the crate
just need to fix possible bugs that I find.
2015-05-01 02:57:39 +01:00
astralenigma d84bfc0f2b Putting all on github now.
Only crates is missing the overlay of the manifesto.
2015-05-01 00:33:21 +01:00
Ikarrus 0615b4e09a Merge branch 'master' of https://github.com/tgstation/-tg-station into ERTcodes 2015-04-30 08:56:46 -06:00
Ikarrus 68d4ffaf3f uncommitted files (+5 squashed commit)
Squashed commit:

[971e023] Lets try loosening the restrictions on territory tagging

[c55a30d] Reduced pen cost to 40

[2b83dca] Formatting and changelog

[1fe81a8] Let's make the message slightly less gamey

[3067acc] Changeloggery
2015-04-29 20:28:28 -06:00
Ikarrus 2b83dca4c5 Formatting and changelog 2015-04-29 19:29:15 -06:00
Ikarrus 1fe81a8e39 Let's make the message slightly less gamey 2015-04-29 19:21:39 -06:00
Incoming 7459238065 Merge branch 'master' of https://github.com/tgstation/-tg-station into begone_ye_jellies
Conflicts:
	code/game/machinery/teleporter.dm
2015-04-29 13:37:01 -04:00
Cheridan 64b5f8540c Merge pull request #9164 from Fayrik/TheNanoing
The Nanoing (Part One: Atmospherics)
2015-04-29 09:38:56 -05:00
Firecage 03ca264eb1 Allows you to buckle people to an operating table. 2015-04-29 16:04:22 +02:00
Cheridan 36df27ad53 Merge pull request #9205 from phil235/SpiderKnifeFixes
Spiders and kitchen tool fixes
2015-04-29 08:23:10 -05:00
MrStonedOne bd6d51a0b5 Massive MC and subsystem rewrite
MC:
	No longer tracks a subsystem's cpu usage. This was basically worthless and took up space on the stat panel
	Can calculate wait down to a tenth of a decisecond to make it fps/world.ticklag agnostic
	Now allows subsystems to have a dynamic wait, that is based on a ratio of how long that subsystem has been taking to process(cost). (This system allows for upper and lower bounds, and an changeable cost delta for each subsystem)
	MC can now be told to init a zlevel

All Subsystems:
	Stats panel now allows child subsystems to pass it a message to add to its stats entry. All subsystems have been moved over to this system - This should cut down on subsystems having to copy and paste the stats proc in order to add to it
	All subsystems now properlly handle being given a zlevel in their init proc

Subsystem changes:
	Air:
		Added air to the dynamic wait subsystem. upper bound: 50, lower bound: 5, cost delta: 3 times process cost
		Air now fires 4 times faster when it can do so without lagging things up
		Pipenet has been merged into air
		Atmos machinery now processes with process_atmos(), ticked by air, not machinery.
		Hotspots (the fire object) are now object pooled
	Pipenet:
		Deleted, added to air
	Machinery:
		Moved all atmos calcualtions in all objects's process() to process_atmos().
	Lighting:
		Added Lighting to the dynamic wait subsystem. upper bound: 20, lower bound: 5, cost delta: 3 times process cost
	Ticker:
		Fixed ticker not updating the lobby panel when game start delayed
		Fixed the game start timer updating rapidly from queued fires when game start delay is removed
	Garbage/qdel:
		qdel will now limit its process time to 2ds a fire.
		qdel can now be given hints as a return to Destroy() as to what should be done with the object.
		the options are:
			queue: (default) this is the normal behavior.
			letmelive: old default to non-null/zero. does nothing with the object
			iwillgc: functionally the same as above, mainly to let people working with objects know that the object will not be queued for GC checking
			harddel: this will queue the object to be deleted without storing a soft reference, mainly to save locate() processing time.
			harddel_now: this will del() the object. To allow for a clean removal of every del() not in qdel
		All objects have been updated to the new system, harddel and iwillgc was not added to any new objects.
		Fixed some objects not GCing because they didn't properlly clear references in Destory()
		Fixed some objects getting qdel'ed preventing other objects from getting GCed because they did not null their reference to that object.
2015-04-29 02:00:25 -07:00
Ikarrus fceaa8f969 Gang Update
- Bosses can now summon their gangsters to a location with the gangtool
- Gangtools cannot recall the shuttle if the station is too damaged (<70% Integrity)
- Fixed SSshuttle.emergencyLastCallLoc not being handled or stored properly. Fukken Carn breaking my shuttle features.
- Fixed a potential injection exploit in gangtool's can_use()
- Jobbanned players cannot be promoted
2015-04-28 22:25:55 -06:00
phil235 9b90645cec Merge pull request #9199 from TheVekter/buggate2015
Buggate 2015 PART 1: Slimes, drinks, and more!
2015-04-28 22:01:13 +02:00