0ec14cf267
Merge pull request #1412 from Krausus/PrescriptionGlassesRefactor
...
Refactors and Expands Prescription Glasses Upgrades
2015-06-30 02:25:00 -04:00
4d04bb7750
Guts Moronic Phoron
2015-06-30 01:06:09 -04:00
62d8435b12
Merge pull request #1410 from Fox-McCloud/ether
...
[Chemistry] Adds in Ether
2015-06-29 19:05:51 -04:00
f969a0f659
Merge pull request #1394 from Fox-McCloud/ai-vox
...
AI Vox Refactor
2015-06-29 19:04:05 -04:00
524fa94205
Merge pull request #1407 from Fox-McCloud/Chainsaw-tweak
...
Chainsaw Tweaks
2015-06-29 18:35:23 -04:00
ebabf9f7bb
Map Edits, Minor Fixes
2015-06-29 16:22:59 -04:00
7ca9679088
Refactors and expands prescription glasses upgrades
2015-06-29 01:58:29 -04:00
a89ddd5a7d
Adds in Ether
2015-06-28 20:39:26 -04:00
af2410c3f8
Fixes Pizza Bomb Pathing
2015-06-28 18:56:02 -04:00
eec810647a
Chainsaw Tweaks
2015-06-28 15:58:04 -04:00
2a34b600a9
Merge pull request #1397 from Krausus/GarbageCollectorWasGarbage
...
Garbage Collector Fixes/Tweaks/Cleanup/Documenting
2015-06-28 06:36:04 -04:00
b386cec388
Initial GC fixes/tweaks/cleanup/documenting
2015-06-27 01:56:57 -04:00
d843632f95
AI Vox Refactor
2015-06-26 17:30:48 -04:00
76837a0bce
Merge pull request #1388 from PJB3005/master
...
In which I realise that I am an idiot.
2015-06-25 18:11:21 -04:00
a1c4c2eec6
goddamnit spess
2015-06-25 15:24:16 +02:00
c28f9bb8ca
Merge pull request #1370 from FalseIncarnate/master
...
Synthetic Reagent Processing and Synth Drugs
2015-06-24 17:49:02 -04:00
02aaca9c7b
Merge remote-tracking branch 'upstream/master' into revenants
2015-06-23 23:44:20 -04:00
e41fbaa146
Fix ziptie log being backwards.
2015-06-23 13:19:05 -07:00
fc6ebc4854
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
2015-06-23 04:18:46 -04:00
acf1e268f1
Synthetic Reagent Processing and Synth Drugs
2015-06-23 04:17:01 -04:00
4d9baf9936
Merge pull request #1358 from Fox-McCloud/sarin-tabun
...
Sarin -> Tabun
2015-06-22 21:40:51 -04:00
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
44f7ad997c
Merge pull request #1355 from tigercat2000/tgetor2
...
Bay/-tg- Meteor port
2015-06-22 16:37:23 -04:00
62946e5217
Fixes medical wardrobe containing excess clothing
2015-06-21 22:07:40 -04:00
d129ceb53f
Make flaming meteors more flamey.
2015-06-21 18:54:42 -07:00
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
f916eb7e2d
Fix a few ex_act's.
2015-06-21 18:40:00 -07:00
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
8cffde0d46
Merge pull request #1365 from PJB3005/master
...
oh god I hope this fixes spess
2015-06-21 19:56:04 -04:00
fee0a6e148
oh god I hope this fixes spess
2015-06-22 01:36:05 +02:00
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
6d990e2179
Merge pull request #1353 from Fox-McCloud/explosion-rework
...
Explosion Rework
2015-06-21 16:11:05 -04:00
99c1476e7f
Merge pull request #1351 from Fox-McCloud/throwing
...
Removes a few Hitby Messages
2015-06-21 16:06:22 -04:00
8e450f99c8
tweaks and optimization
2015-06-21 02:16:18 -04:00
9ac32773ec
Fix revolution. Antag-selection oopsied it.
2015-06-20 16:24:26 -07:00
dcf126d3b3
Merge pull request #1347 from PJB3005/master
...
Lighting optimizations.
2015-06-20 17:38:58 -04:00
a75a1165dc
Sarin->Tabun
2015-06-20 15:21:24 -04:00
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
320e481677
Alright
2015-06-20 16:22:51 +02:00
e068fabdb4
In which I unfuck Life()...
...
SLIGHTLY.
2015-06-20 14:47:54 +02:00
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
93392f8e90
Explosion Rework
2015-06-20 04:13:55 -04:00
96685733a9
Removes a few Hitby Messages
2015-06-20 01:34:53 -04:00
5f2f3f6789
Merge pull request #1343 from tigercat2000/DidntIsayIamGoingtoStopThisstuff
...
Window spawners + Adding to map
2015-06-19 22:19:37 -04:00
113ef6b211
Fixes cult icon removal runtiming, probably
2015-06-19 10:53:34 -04:00
05826a8ad9
Merge pull request #1340 from Fox-McCloud/objectives
...
Objective Tweaks
2015-06-19 08:25:09 -04:00
3947ff9bbc
Merge pull request #1335 from Fox-McCloud/resizing
...
Codebase Size Reduction--Music
2015-06-19 08:24:27 -04:00
d7e9c36474
Clean up window coloring code a bit. Also makes windowspawners only create
...
windows where needed, not everywhere then deleting the ones it doesn't
want.
2015-06-18 19:58:08 -07:00
b10ea269ef
bless fix
2015-06-18 18:04:37 -04:00
ada66fabd4
Update II
2015-06-18 17:47:52 -04:00
Fox-McCloud