Commit Graph

22199 Commits

Author SHA1 Message Date
Fox-McCloud
02aaca9c7b Merge remote-tracking branch 'upstream/master' into revenants 2015-06-23 23:44:20 -04:00
Fox-McCloud
9691251a1e Revert "spawns"
This reverts commit 18bed664c7.
2015-06-23 23:42:33 -04:00
Fox-McCloud
18bed664c7 spawns 2015-06-23 23:12:59 -04:00
Robertha89
4ef6295414 I made changes
where they where not needed due to an oooooold bug.
2015-06-24 04:41:12 +02:00
Robertha89
6968560e16 herp
de derp
2015-06-24 04:40:03 +02:00
Robertha89
b7e43286a6 New hat for Ian and new tool for pets
while life serve the same function, it is somewhat difficult to make,
the lazarus injector revives any neutral simple_animal on use, and can
turn hostile animals friendly towards them if it has been emped. so five
of those has been added to the crittercare.

Most importantly, Ian got  a new mask, the mustache.
2015-06-24 04:37:48 +02:00
Fox-McCloud
b8d21f6721 Merge pull request #1368 from TheDZD/hardsuit-attachment
Hardsuit Attachment Changes
2015-06-23 21:22:55 -04:00
Robertha89
fc6ec4982f Pet Collar Bug Fix
If you had Ian with a pet collar name like spot, and you gave him say a wizard name, then he would deafault to his real_name over his name, and making it impossible to restore the name on the collar.
2015-06-24 03:20:32 +02:00
Robertha89
9573213bab revert viro access 2015-06-24 01:27:28 +02:00
Robertha89
733368a101 Supply crates medical
Adds brute trauma treatment kits to cargo.
Changes access on Virus crate from CMO to Virologist, as the reason it was there in the first place was due to the previous system having virus bottle for direct use, and without being able to feed this virus it can't infect people, maybe.
2015-06-24 00:48:37 +02:00
FalseIncarnate
f3c9098ecd Reaction_Mob Checks and Golem Reagent Processing Change
Reaction_mob(), which handles things like TOUCH based reactions, now
will properly obey process_flags.
- This means things like Synthflesh won't work on Synthetics.

Changed Golems from PROCESS_DUO to PROCESS_ORG
- This will give them back the ability to be healed via chemistry, since
they don't naturally regenerate.
- PROCESS_DUO remains defined in case someone finds a use for it
(adminbuse maybe?)
2015-06-23 18:06:54 -04:00
Fox-McCloud
05c3b89a3f Merge pull request #1373 from tigercat2000/AAAAAHHHHHHHHRAAAAAGE
Fix ziptie log being backwards.
2015-06-23 16:36:15 -04:00
Tigercat2000
e41fbaa146 Fix ziptie log being backwards. 2015-06-23 13:19:05 -07:00
FalseIncarnate
fc6ebc4854 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 2015-06-23 04:18:46 -04:00
FalseIncarnate
acf1e268f1 Synthetic Reagent Processing and Synth Drugs 2015-06-23 04:17:01 -04:00
Fox-McCloud
b2837f6023 tweaks, update 2015-06-22 22:41:58 -04:00
ZomgPonies
4d9baf9936 Merge pull request #1358 from Fox-McCloud/sarin-tabun
Sarin -> Tabun
2015-06-22 21:40:51 -04:00
Fox-McCloud
1b93e9e5db Merge pull request #1364 from tigercat2000/poolit
-tg- atom pooling system, qdel changes
2015-06-22 17:01:22 -04:00
Tigercat2000
bcb4a9601f Merge remote-tracking branch 'upstream/master' into poolit
Conflicts:
	code/game/objects/structures/displaycase.dm
	code/game/objects/structures/grille.dm
	code/game/objects/structures/lamarr_cage.dm
2015-06-22 13:40:07 -07:00
Fox-McCloud
44f7ad997c Merge pull request #1355 from tigercat2000/tgetor2
Bay/-tg- Meteor port
2015-06-22 16:37:23 -04:00
DZD
c8c90608e1 Hardsuit Attachment Changes
- Makes it so you don't have to be on help intent, or targeting the head
to attach a helmet onto a hardsuit.
- Same deal for attaching magboots to a hardsuit.
2015-06-22 10:43:37 -04:00
Fox-McCloud
1fb3266b21 Merge pull request #1366 from Krausus/GenericWardrobeContentsFix
Fixes Unintended Wardrobe Contents
2015-06-21 23:40:21 -04:00
Krausus
62946e5217 Fixes medical wardrobe containing excess clothing 2015-06-21 22:07:40 -04:00
Tigercat2000
d129ceb53f Make flaming meteors more flamey. 2015-06-21 18:54:42 -07:00
Krausus
831332155a Fixes generic wardrobe contents
This fixes the wardrobe base type creating items, which was fine when
wardrobes didn't call their parent's New proc, but was causing literally
every wardrobe to contain some junk now that they do.

The base wardrobe type's items have been moved to a new "generic"
wardrobe, which is now used in the derelicts and an unused away mission,
replacing mapped instances of the base type.
2015-06-21 21:50:35 -04:00
Tigercat2000
f916eb7e2d Fix a few ex_act's. 2015-06-21 18:40:00 -07:00
Tigercat2000
7c9139d6e0 Bay/-tg- Meteor port
Meteors now have different types, properly integrated.
Meteoract has been removed, meteors now just call ex_act.
2015-06-21 18:39:39 -07:00
Tigercat2000
0918ded8be Remove debugging "world <<" from qdel. 2015-06-21 17:06:33 -07:00
Fox-McCloud
8cffde0d46 Merge pull request #1365 from PJB3005/master
oh god I hope this fixes spess
2015-06-21 19:56:04 -04:00
PJB3005
fee0a6e148 oh god I hope this fixes spess 2015-06-22 01:36:05 +02:00
Tigercat2000
d20298e996 -tg- atom pooling system, qdel changes
This commit first and foremost ports the -tg- atom pooling system, and
removes the old experimental system entirely.

Secondly, this PR modifies the qdel system to use a -tg- lookalike
"destroy hint" system, which means that individual objects can tell qdel
what to do with them beyond taking care of things they need to delete.
This ties into the atom pooling system via a new hint define,
QDEL_HINT_PUTINPOOL, which will place the atom in the pool instead of
deleting it as per standard.

Emitter beams are now fully pooled.

Qdel now has semi-compatibility with all datum types, however it is not
the same as -tg-'s "Queue everything!" system. It simply passes it through
the GC immediately and adds it to the "hard del" lists. This means that
reagents can be qdel'ed, but there is no purpose as of yet, as it is more
or less the same as just deleting them, with the added effect of adding
logs of them being deleted to the garbage collector.
2015-06-21 15:47:57 -07:00
TheDZD
6d990e2179 Merge pull request #1353 from Fox-McCloud/explosion-rework
Explosion Rework
2015-06-21 16:11:05 -04:00
TheDZD
99c1476e7f Merge pull request #1351 from Fox-McCloud/throwing
Removes a few Hitby Messages
2015-06-21 16:06:22 -04:00
Fox-McCloud
8e450f99c8 tweaks and optimization 2015-06-21 02:16:18 -04:00
Fox-McCloud
4481968c5d Merge pull request #1361 from tigercat2000/falsemap
[Map Edit][Fix] Space Vent fixes and Incinerator Tweak (take 2)
2015-06-20 22:38:51 -04:00
FalseIncarnate
499385c081 Space Vent fixes and Incinerator Tweak.
Fixes a number of space vents not being connected to pipes, should let
them function as intended.
- Also replaced their vents with "On" vents, just to be sure

Tweaked the configuration of the incinerator's pipes, general
functionality unchanged.
2015-06-20 19:16:45 -07:00
Fox-McCloud
bf2c6f7927 Merge pull request #1360 from tigercat2000/iwhoopsiedrev
Fix revolution. Antag-selection oopsied it.
2015-06-20 20:42:38 -04:00
Tigercat2000
9ac32773ec Fix revolution. Antag-selection oopsied it. 2015-06-20 16:24:26 -07:00
Fox-McCloud
1becaa7642 oops 2015-06-20 17:43:42 -04:00
Fox-McCloud
dcf126d3b3 Merge pull request #1347 from PJB3005/master
Lighting optimizations.
2015-06-20 17:38:58 -04:00
Fox-McCloud
a75a1165dc Sarin->Tabun 2015-06-20 15:21:24 -04:00
Fox-McCloud
73fb6822ba Merge pull request #1356 from Krausus/RegenerativeStasisFix
Fixes Changeling's Regenerative Stasis
2015-06-20 13:51:06 -04:00
Fox-McCloud
300b96b8da "responsible" 2015-06-20 13:16:27 -04:00
Krausus
d457eba45a Fixes regenerative stasis' organ regeneration
Organs weren't actually regenerating, and any missing organs would cause
a runtime, breaking the regeneration entirely.
2015-06-20 12:37:25 -04:00
PJB3005
d0f32728cd Whatever the hell an underf is, it's gone now 2015-06-20 16:32:31 +02:00
PJB3005
320e481677 Alright 2015-06-20 16:22:51 +02:00
PJB3005
e068fabdb4 In which I unfuck Life()...
SLIGHTLY.
2015-06-20 14:47:54 +02:00
PJB3005
8ad74ebb6e Fixes all your problems...
Except the fact that 75% of paradise is still using del, and you have no pooling.

Or defer_powernet_rebuild, do you guys have that yet?
2015-06-20 14:47:45 +02:00
Fox-McCloud
93392f8e90 Explosion Rework 2015-06-20 04:13:55 -04:00
Fox-McCloud
96685733a9 Removes a few Hitby Messages 2015-06-20 01:34:53 -04:00