Markolie
bc424946c4
Add attack delay to alien nests
2015-08-09 17:27:02 +02:00
TheDZD
13689db0ef
Merge pull request #1652 from Fox-McCloud/fox-is-evil
...
Ports over Airhorns
2015-08-07 17:56:14 -04:00
Fox-McCloud
c3ad070066
Ports over Airhorns
2015-08-06 00:42:17 -04:00
Fox-McCloud
78950ec682
tweak 2.0
2015-08-05 20:12:11 -04:00
Fox-McCloud
e8ece032c9
Merge pull request #1635 from tigercat2000/plaintextisbadsometimes
...
Replace (TM) in mirror title with actual TM character
2015-08-03 21:25:33 -04:00
Tigercat2000
b8be8cb4ca
Replace (TM) in mirror title with actual TM character)
2015-08-03 14:53:28 -07:00
Fox-McCloud
82f62da60f
Merge pull request #1604 from TheDZD/helper
...
Subtypesof Helper Proc
2015-08-03 17:44:01 -04:00
DZD
d9bb30f47a
Replaces typesof with subtypesof where applicable
2015-08-03 11:04:28 -04:00
Markolie
e35431da34
Port Bay's appearance changer
2015-08-01 23:22:20 +02:00
DZD
ba82f03d7c
Drill and drone fixes
...
- Fixes mining drones having access to a plasma cutter energy weapon,
replaced with a diamond drill. Functionality is almost identical to what
it was with old plasma cutters.
- Pathing fixes for diamond drills.
2015-08-01 10:13:54 -04:00
Fox-McCloud
ab083aff50
Mining Fixes
2015-07-30 17:01:59 -04:00
Fox-McCloud
1ee7853d65
Merge pull request #1476 from TheDZD/mining2
...
Mining Overhaul [Soon™]
2015-07-29 20:51:24 -04:00
Fox-McCloud
eb694a50eb
Updates Nuke Disk Spawning
2015-07-24 17:33:25 -04:00
DZD
29e70854e9
Fix merge conflicts
...
🖕 map conflicts over lines that weren't even edited by both upstream
and this branch.
2015-07-15 22:28:12 -04:00
Krausus
8e753ac1a6
Removes redundant timestamp
2015-07-14 04:18:35 -04:00
Krausus
6376907560
Further fixes to morgues and crematoriums
2015-07-14 04:08:56 -04:00
Krausus
5d342baffb
Fixes morgues and crematoriums (includes resisting)
...
Fixes their trays breaking for 30 seconds, not logging cremations, not
being able to resist out of them, and all these damn uses of src.
2015-07-13 07:31:48 -04:00
ZomgPonies
f4ea821829
Merge pull request #1496 from Fox-McCloud/LINDA-Pressure
...
LINDA Pressure Changes
2015-07-12 22:35:21 -04:00
Fox-McCloud
057c15982e
Re-adds Security Helmets to Officer's Lockers
2015-07-11 10:10:57 -04:00
Fox-McCloud
99bf49504a
LINDA Pressure Changes
2015-07-11 06:28:03 -04:00
DZD
412443dbf1
Fix non-icon merge conflicts
2015-07-10 19:57:59 -04:00
Fox-McCloud
54f59b9899
Pass II
2015-07-09 19:51:40 -04:00
DZD
916f9bf4bb
Sort of compiles
...
Time to fix xenoarch, and then the map.
2015-07-09 15:55:36 -04:00
Fox-McCloud
0dbea7621f
The Great Del() Cull of 2015
2015-07-09 02:48:34 -04:00
Fox-McCloud
6e87b96501
Pass 3
2015-07-08 01:34:53 -04:00
Fox-McCloud
0fd80d0b1f
pass one fix
2015-07-08 01:09:10 -04:00
Fox-McCloud
9dc27ce126
Destroy Pass II
2015-07-07 22:26:28 -04:00
Fox-McCloud
a9f3eab669
pass 2+fix
2015-07-07 00:58:34 -04:00
Tigercat2000
3a45d52fe0
Fix remaining non-returning Destroys()
...
Plus a little refactor to mining flaps and spacepod doors- they now use
CanAtmosPass instead of manually setting the turf to no-atmos-passing
2015-07-06 09:20:39 -07:00
Fox-McCloud
44881a4016
Tweaks a Few Destroy()'s
2015-07-05 04:51:47 -04:00
Fox-McCloud
a89ddd5a7d
Adds in Ether
2015-06-28 20:39:26 -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
Krausus
62946e5217
Fixes medical wardrobe containing excess clothing
2015-06-21 22:07:40 -04: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
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
96685733a9
Removes a few Hitby Messages
2015-06-20 01:34:53 -04:00
Fox-McCloud
5f2f3f6789
Merge pull request #1343 from tigercat2000/DidntIsayIamGoingtoStopThisstuff
...
Window spawners + Adding to map
2015-06-19 22:19:37 -04:00
Tigercat2000
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
Fox-McCloud
cbc9458379
Merge pull request #1331 from TheBeoni/Brig-Phys
...
Brig Doctor Jumpsuit.
2015-06-17 23:02: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
Nienhaus
060318cb29
Adds Deer ;D
2015-06-15 18:50:39 -05:00
Fox-McCloud
8a78887ba6
Blueshield Jacket Re-submission
2015-06-14 14:23:55 -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
Fox-McCloud
c6cc874869
Get Turf Optimizations
2015-06-09 21:29:21 -04:00
ZomgPonies
fd2dce684f
Merge pull request #1159 from tigercat2000/MetaStationPort
...
MetaStation V41A II port
2015-06-05 17:49:13 -04:00
