Commit Graph

9913 Commits

Author SHA1 Message Date
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
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
ZomgPonies
4d9baf9936 Merge pull request #1358 from Fox-McCloud/sarin-tabun
Sarin -> Tabun
2015-06-22 21:40:51 -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
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
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
Fox-McCloud
8e450f99c8 tweaks and optimization 2015-06-21 02:16:18 -04:00
Fox-McCloud
1becaa7642 oops 2015-06-20 17:43:42 -04:00
Fox-McCloud
a75a1165dc Sarin->Tabun 2015-06-20 15:21:24 -04:00
Fox-McCloud
300b96b8da "responsible" 2015-06-20 13:16:27 -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
ZomgPonies
3947ff9bbc Merge pull request #1335 from Fox-McCloud/resizing
Codebase Size Reduction--Music
2015-06-19 08:24:27 -04:00
ZomgPonies
b2e821ebb0 Fixes fancy uniform 2015-06-18 16:24:04 -04:00
Krausus
c0075f41d0 Fixes get_apc with a BYOND bug workaround
Also reverts the mining asteroid-specific workaround
2015-06-18 04:54:31 -04:00
Fox-McCloud
36b7e7b233 Merge pull request #1333 from SamCroswell/NinjaDev
EKatana Changes, Removes Ninja Eye Implant
2015-06-18 01:02:17 -04:00
SamCroswell
192b568d6c Re-Submission of a352f2c 2015-06-18 00:27:03 -04:00
SamCroswell
e8e8f2e6df Temporary Revert of a352f2
This reverts commit a352f2c5c2.
2015-06-18 00:18:13 -04:00
Fox-McCloud
cbc9458379 Merge pull request #1331 from TheBeoni/Brig-Phys
Brig Doctor Jumpsuit.
2015-06-17 23:02:06 -04:00
Fox-McCloud
83fb1a4bab Codebase Size Reduction--Music 2015-06-17 18:14:14 -04:00
SamCroswell
a352f2c5c2 Removes Ninja Eyewear 2015-06-17 00:49:41 -04:00
SamCroswell
1f18dcd2d1 Updates Katana Code 2015-06-17 00:42:57 -04:00
Fox-McCloud
75e68e618d Merge pull request #1325 from Nienhaus/master
Adds Deer ;D
2015-06-16 21:18:06 -04:00
TheBeoni
fd4c40fcf9 Added brig physician jumpsuit. Brig Physician spawns with one, i also put one spare into locker. 2015-06-17 02:11:01 +02:00
Fox-McCloud
3939d46f8a Merge pull request #1329 from TheBeoni/Misspelt-Blueshield
Blueshied to Blueshield Fix.
2015-06-16 18:34:02 -04:00
Fox-McCloud
4c3c38189e Merge pull request #1328 from FalseIncarnate/master
[Fix] Diona Nymph runtime and Fruit Attack fixes
2015-06-16 17:40:15 -04:00
TheBeoni
5b376bcf76 Blueshied to Blueshield Fix.
I misspelt Blueshield for Blueshied so i am ashamed.
2015-06-16 23:34:01 +02:00
FalseIncarnate
3166200c5e Diona Nymph runtime and Fruit Attack fixes
Fixes a runtime preventing Diona Nymphs from eating weeds and regaining
nutrition

Fixes fruit attacks checking for "hurt" when they should check for
"harm".
- You can now smack people with fruit on harm intent. If the plant has
TRAIT_STINGS, it will inject them with it's chemicals
- You can now crush a fruit in your hand on harm intent to destroy it
(will not leave trash like banana peels!). This will trigger the same
effects that throwing the fruit would have, except without needing to
throw it.
- Use this to activate that smoke-screen tobacco you spent all round
mutating, or to make a quick escape with your bluespace tomato!
2015-06-16 17:09:39 -04:00
Fox-McCloud
ed6f675ffb Merge pull request #1321 from ZomgPonies/elpresidente
Adds in new fancy uniform for events
2015-06-16 16:30:48 -04:00
ZomgPonies
b5bf126222 Merge pull request #1317 from Fox-McCloud/lampsssss
Moveable Desklamps
2015-06-16 08:02:27 -04:00
ZomgPonies
2879590f76 Merge pull request #1314 from Fox-McCloud/powernet-tweaking
Powernet Tweaks
2015-06-16 08:02:10 -04:00
Nienhaus
060318cb29 Adds Deer ;D 2015-06-15 18:50:39 -05:00
ZomgPonies
9a6ac0e44a Adds in new fancy uniform for events 2015-06-15 11:05:06 -04:00
Krausus
66506d9049 Fixes Make Wizard and timed alerts
Turns out timed alerts, which are ONLY used by Make Wizard, were broken
ever since they were added... 11 months ago. Now they work, so Make
Wizard works.
2015-06-15 11:03:23 -04:00
Krausus
7aa8c06e6c Fixes runtime when add_reagent-ing 0 of something
On rare occasions, something will try to add 0 of a reagent, which would
cause problems.
2015-06-15 10:10:26 -04:00
Krausus
43578f8172 Fixes one-click-antag runtimes
Should make one-click-wizard stop breaking unpredictably.
2015-06-15 09:58:23 -04:00
Krausus
ea34114321 Fixes protolathe stack-inserting runtime 2015-06-15 08:52:53 -04:00
Krausus
094e3e24cc Fixes HUDType runtimes 2015-06-15 08:22:05 -04:00
Fox-McCloud
bea4974d72 Moveable Desklamps 2015-06-14 22:34:04 -04:00
Fox-McCloud
3f70dc58d6 Powernet Tweaks 2015-06-14 17:21:01 -04:00
Fox-McCloud
8a78887ba6 Blueshield Jacket Re-submission 2015-06-14 14:23:55 -04:00
ZomgPonies
200a948fc9 Merge pull request #1308 from Robertha89/master
Ads xeno fat suit
2015-06-14 04:55:14 -04:00
ZomgPonies
b2f0cc8deb Merge pull request #1297 from Fox-McCloud/rip-emag-rng
Removes Emag RNG on APCs
2015-06-14 04:54:32 -04:00
Robertha89
662a101bce adds xeno fat suit 2015-06-14 09:12:40 +02:00