Commit Graph

5039 Commits

Author SHA1 Message Date
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
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 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
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 ada66fabd4 Update II 2015-06-18 17:47:52 -04:00
Fox-McCloud 75e68e618d Merge pull request #1325 from Nienhaus/master
Adds Deer ;D
2015-06-16 21:18:06 -04: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
Nienhaus 060318cb29 Adds Deer ;D 2015-06-15 18:50:39 -05:00
Krausus 094e3e24cc Fixes HUDType runtimes 2015-06-15 08:22:05 -04:00
Fox-McCloud 5db85679cc Singulo Optimization 2015-06-14 00:31:11 -04:00
Fox-McCloud 09097b38ed Revenant 2015-06-13 20:10:02 -04:00
ZomgPonies bb02973e49 Merge pull request #1288 from Fox-McCloud/singularity-OOP
Singularity and Narsie Refactor
2015-06-13 04:18:40 -04:00
Fox-McCloud 344a5e8157 Merge pull request #1293 from SamCroswell/VisionUpdate
Vision Update
2015-06-13 02:49:09 -04:00
SamCroswell 4e3f4bfa17 Adds Vision Flags for Helmets 2015-06-11 23:15:42 -04:00
SamCroswell dcc0128a54 Removes Automatic Night Vision from Mesons/Thermals
Mersons, Thermals, and Material Scanners no longer have automatic
nightvision.
2015-06-11 21:56:20 -04:00
SamCroswell b6cd6b4384 Rewrites HUD Handling for Glasses 2015-06-11 21:42:15 -04:00
Fox-McCloud e6524e19a4 Removes Borg Emag RNG 2015-06-11 01:19:09 -04:00
ZomgPonies bc4525f145 Merge pull request #1283 from Fox-McCloud/Throw-BYOND-Instead
Makes the Code Compile for 508.1287+Travis Update
2015-06-10 21:19:46 -04:00
Fox-McCloud 2ad1c74457 Singularity Refactor 2015-06-10 20:04:28 -04:00
Krausus 94c2c3cca2 Removes two old/unused/redundant magical projectiles 2015-06-10 07:45:05 -04:00
Fox-McCloud 6614ab8a8c Makes the Code Compile for 508.1287+Travis Update 2015-06-09 18:14:15 -04:00
Krausus 1fc0f235ef Fixes plurality of stacks and updates miss message
Some stacks didn't have their gender set to plural, despite having a
pluralized item name.
2015-06-08 23:32:44 -04:00
Krausus 3299870a2e Fixes bees not checking for calmers properly
This check was so wrong. How could anyone even...
2015-06-08 09:09:33 -04:00
Krausus 7178370044 Fixes various runtimes
Fixes:

- Body scanners runtiming from bad drag-drops
- Flashbangs runtiming when flashing humans without eyes
- Diona nymphs runtiming because they're not simple animals with an
environment_smash var
- A thrown object colliding with a non-existent limb runtiming
- Brains runtiming when redundantly removed
- Thrown objects runtiming when they can't find an area
2015-06-08 08:53:43 -04:00
Krausus a7eea3487f Fixes missing/broken admin permission checks
Also fixes a small issue with the permissions panel, because the error
message was really annoying me.
2015-06-08 07:55:29 -04:00
Krausus 075f89fcb0 Fixes stacks acting strange for cyborgs
Robot modules weren't handling qdel'd stacks properly, so now they
simply don't get qdel'd. They shouldn't get deleted often enough for
this to hurt performance.

Also, the module slot of a stack will now be deselected when it's used
up, and it will show up immediately when respawned while recharging.
2015-06-08 06:37:52 -04:00
Krausus 564048f8e0 Fixes missing handling for various statuses
Simple animals, cyborgs, and PAIs were missing handlers for things like
sleeping or deafness, causing issues when reconnecting or getting
flashbanged.
2015-06-08 05:11:50 -04:00
Krausus a556ae8539 Fixes not spawn()ing throw_ats in human/gib() 2015-06-08 03:46:03 -04:00
Fox-McCloud b454fb9628 eh 2015-06-07 17:17:52 -04:00
ZomgPonies 5a0ffcf3bf Merge pull request #1238 from Fox-McCloud/stun-fix
Fixes Stuns (Dropping Items or lack there of).
2015-06-01 19:43:22 -04:00
ZomgPonies 767a289a70 Merge pull request #1241 from tigercat2000/0c5f8ac319a2209aecfb475587e28958
Fix species ventcrawl var not working
2015-06-01 15:38:29 -04:00
Tigercat2000 6522752818 Fix species ventcrawl var not working 2015-06-01 12:15:37 -07:00
Fox-McCloud 4e4e3c4990 Stun Fix 2015-05-31 20:35:49 -04:00
Fox-McCloud e098364432 Stun+Weaken Balancing 2015-05-31 06:35:14 -04:00
ZomgPonies 5e884204e4 Merge pull request #1224 from Fox-McCloud/Mob-blob-rebalance
Mob and Blob Damage Rebalance
2015-05-31 02:59:00 -04:00
Tigercat2000 ba646c51a1 Fix being able to throw people while not next to them 2015-05-30 20:30:43 -07:00
Tigercat2000 c861540dbb Fix headbutting. For the 3rd time.
Jeez, I should take some lessons on ACTUALLY FIXING BUGS.
2015-05-30 20:21:40 -07:00
ZomgPonies e5f026d02e Merge pull request #1216 from tigercat2000/OHGODIHAVETOTESTTHIS
Port Atlas's implementation of -tg-'s canvas art.
2015-05-30 20:17:41 -04:00
Fox-McCloud 7a8a258a87 Merge pull request #1226 from Krausus/Fixes-201505300219
Various Minor Fixes
2015-05-30 07:00:48 -04:00
Krausus 8ab18c27d8 Fixes some Stat procs statting to the wrong panel 2015-05-30 06:18:18 -04:00
Krausus 755467ac20 Fixes examining those with limb stumps/accessories
Limb stumps would show as "He has a limb stump on his limb stump", and
accessories would be lowercased and worded poorly.
2015-05-30 05:35:18 -04:00
Fox-McCloud c7bfba28e4 Mob and Blob Damage Rebalance 2015-05-30 04:13:12 -04:00
ZomgPonies f57359069a Merge pull request #1223 from Fox-McCloud/fix-stuff-ok-whatever-fixed-but-why-fine-fixed-anyway
Fixes and Tweaks to Defenses
2015-05-30 02:35:51 -04:00
Fox-McCloud 0602435d8a Fixes and Tweaks to Defenses 2015-05-30 01:47:25 -04:00