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
d129ceb53f
Make flaming meteors more flamey.
2015-06-21 18:54:42 -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
Tigercat2000
9ac32773ec
Fix revolution. Antag-selection oopsied it.
2015-06-20 16:24:26 -07: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
Fox-McCloud
93392f8e90
Explosion Rework
2015-06-20 04:13:55 -04:00
Krausus
113ef6b211
Fixes cult icon removal runtiming, probably
2015-06-19 10:53:34 -04:00
Fox-McCloud
97ae66260c
Objective Tweaks
2015-06-18 02:04:44 -04:00
Fox-McCloud
68c420af2e
Fixes Lazy Syndicates
2015-06-14 23:49:28 -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
2ad1c74457
Singularity Refactor
2015-06-10 20:04:28 -04:00
Krausus
8a7e480e02
Fixes shadowling end-round report formatting
2015-06-10 10:26:34 -04:00
Krausus
31b4fc9082
Fixes wizard end-round spell listing
...
Wizard spells are now stored in their mind, not in their mob
2015-06-10 10:17:08 -04:00
Krausus
2d76db53a0
Fixes issues in meteor mode's sendmeteors()
...
A missing spawn() was causing the ticker to hang, and it was possible
for the meteor wave to last forever if it started close enough to
midnight GMT
2015-06-08 04:05:29 -04:00
ZomgPonies
715e5aa260
Merge pull request #1260 from Fox-McCloud/viewrange
...
Dynamic HUD
2015-06-08 02:03:03 -04:00
ZomgPonies
88c5d1a4ac
Merge pull request #1136 from tigercat2000/spbook
...
Spellbook overhaul
2015-06-07 14:11:14 -04:00
Tigercat2000
2b9f242659
Spellbook Overhaul; Remove rightandwrong antag making, href sanitizing
...
Rightandwrong will no longer have a 25% chance to make people antags,
since the spellbook overhaul makes it give a spellslot.
2015-06-07 11:04:57 -07:00
Fox-McCloud
f09a0f8d75
second pass
2015-06-07 09:52:52 -04:00
Fox-McCloud
6e310a4832
View Range Change
2015-06-05 22:37:26 -04:00
Fox-McCloud
80ce8f2150
Merge pull request #1250 from ZomgPonies/meteor
...
Adds waves to meteor gamemode
2015-06-05 04:52:59 -04:00
ZomgPonies
ffdc3dbe3a
Merge pull request #1248 from Krausus/EscapeObjectiveFix
...
Fixes Escape Objective Issues
2015-06-05 04:51:01 -04:00
Krausus
0638eb2a66
Fixes changeling monkey issues
...
Fixes taking DNA from monkeys, not being able to leave lesser form, and
being able to use all stings in lesser form.
2015-06-05 02:41:48 -04:00
Krausus
716d146ddd
Makes escape objectives fail if restrained
...
Also returns the "alive and free" wording to escape objectives.
2015-06-04 13:14:44 -04:00
ZomgPonies
c7c3efb5d0
Lets not spawn infinite meteors.
2015-06-04 05:43:57 -04:00
ZomgPonies
f37b35bc1f
Adds meteor waves
2015-06-04 05:32:05 -04:00
Krausus
f72c21b606
Fixes Escape Objective Issues
...
Escaping on pods will now work properly, and being handcuffed will cause
failure regardless of where you are.
2015-06-03 20:46:23 -04:00
Fox-McCloud
055f57618c
Adds in a New Title Theme
2015-06-03 18:36:57 -04:00
Fox-McCloud
faa928c23c
Clarifies the Escape Objective
2015-06-01 23:42:35 -04:00
ZomgPonies
12aad61ae4
Merge pull request #1240 from tigercat2000/dfc3c4e9aad5292ed3ff655785b59dfe
...
Port -tg- shuffle helper proc
2015-06-01 15:21:22 -04:00
ZomgPonies
e641c847d6
Merge pull request #1233 from Fox-McCloud/stun-balance
...
Stun+Weaken Balancing
2015-06-01 15:20:19 -04:00
Tigercat2000
b1dc47b4df
Fix incorrect uses of the shuffle proc.
...
Even before the -tg- proc port, it didn't do inline modification of the list.
2015-06-01 08:23:31 -07:00
Aranclanos
58339aaee8
Malf factory-builder overlay.
...
Added an overlay for the AI when she tries to spawn a robotic factory so
the user gets some feedback of where they are building.
Fixes numerous exploits to spawn several factories.
Fixes tgstation/-tg-station#1259
2015-05-31 09:32:42 -07:00
Fox-McCloud
e098364432
Stun+Weaken Balancing
2015-05-31 06:35:14 -04:00
ZomgPonies
c0406687e0
Merge pull request #1215 from tigercat2000/Necastuff
...
Disable enemy-intercept and automatic code blue, by request of Necaladun.
2015-05-30 15:02:11 -04:00
Fox-McCloud
0602435d8a
Fixes and Tweaks to Defenses
2015-05-30 01:47:25 -04:00
Tigercat2000
cb7a180b6e
Disable intercept and auto-blue-alert.
...
This PR Temporarily disables the intercept and automatic-blue-alert until
the system can properly be removed.
2015-05-29 10:17:44 -07:00
ZomgPonies
277a900aa7
Merge pull request #1193 from Fox-McCloud/mobs-pets-stuffs
...
Simple Animal Refactor+Update+Fixes and Pet Collars
2015-05-28 22:45:03 -04:00
DZD
7f9952961f
Fixes Shadowling Intercept
...
This was being sent once for every shadowling, oops.
2015-05-28 15:54:05 -04:00
Fox-McCloud
5d3e837b4a
Mob Refactor+Update and Pet Collars
2015-05-28 00:20:25 -04:00
ZomgPonies
264369bdfa
issmall fixes and order of operations
2015-05-25 23:50:53 -04:00
ZomgPonies
fa5e97deb5
Missing dmis, final fixes
2015-05-25 20:35:35 -04:00
ZomgPonies
e056abfb82
3/3 port done
2015-05-25 20:16:34 -04:00
ZomgPonies
1935a82afe
2/3 of port done
2015-05-25 19:48:13 -04:00
ZomgPonies
f2d03e93c2
First 1/3 of port done.
2015-05-25 17:59:30 -04:00
Krausus
e3c677f857
Fixes runtime from objectiveless traitors
2015-05-25 07:50:15 -04:00
Krausus
41b37821e1
Fixes runtime in PDA pinpointer
2015-05-25 06:51:16 -04:00
ZomgPonies
9e56424d74
Merge pull request #1151 from Krausus/FollowThatEye
...
Adds ghost-following and admin-jumping for AI eyes and ghosts' bodies
2015-05-24 10:19:12 -04:00
