52d13d6035
more tweaks
2015-11-25 02:42:13 -05:00
85d651b781
refactored datum/effect/system because it was a complete mess
2015-11-22 19:43:01 -05:00
13efd8eeae
Merge pull request #2611 from Fox-McCloud/porta-seeder
...
Re-Adds Portaseeder
2015-11-21 21:27:12 -05:00
0e33b7b65e
Merge pull request #2610 from Fox-McCloud/bags-and-qol
...
Chemistry and Bio-Bags and Xenobio QoL
2015-11-20 20:45:15 -05:00
bbab399d6e
Merge pull request #2599 from Fox-McCloud/thanksgiving-food
...
Thanksgiving Update
2015-11-20 19:46:47 -05:00
3e4059728f
Re-Adds Portaseeder
2015-11-20 00:26:51 -05:00
edf2bfc4fc
Chemistry and Bio-Bags and Xenobio QoL
2015-11-19 20:38:07 -05:00
763d0e23c0
Fixes RCS Teleport Exploit
2015-11-19 01:59:46 -05:00
f43e21698c
Updates
2015-11-18 23:17:31 -05:00
1b4a39eb24
MULEbots notify on relevant deliveries
...
Also:
-Adds more request consoles throughout the map
- Atmospherics, Brig Medbay, Warden, Security
2015-11-14 14:29:24 -08:00
ab3ed53734
Kitchen Updates
2015-11-09 01:09:59 -05:00
0604c8d16e
Merge pull request #2325 from Aurorablade/ForTheSwarm2
...
Fethas Carnival of Horrors part 1.5: Swarmers
2015-11-03 19:20:08 -05:00
3c3f51401b
Cuts out all the old weapon/module code
...
Also lets drones collect intercom electronics, and gives the autolathe
an APC electronics recipe
2015-10-13 21:13:49 -07:00
d141945b10
Changed based on feedback
2015-10-13 23:01:28 -04:00
2b54e5cf63
Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into ForTheSwarm2
2015-10-11 22:50:27 -04:00
769a5d3bff
FUUUUUUUUUUUUUUUUUUUUUUUUUUUU
...
Merge conflict EXTREAME FIX
2015-10-08 18:38:45 -04:00
e17c6bde22
Another del->qdel pass
2015-10-08 16:49:10 -04:00
52d4135648
Ambulance/movement fixes
2015-10-03 21:33:40 +02:00
d18b18b5b4
Syndicate borg update, add medical syndicate borg, energy sword refactor
2015-10-01 04:21:24 +02:00
e96103a02b
Fluff item clean-up
2015-09-25 04:31:30 +02:00
4e9befc310
Tweaks
2015-09-21 00:25:27 -04:00
263c67ea2e
tweak
2015-09-20 17:26:01 -04:00
72e14e59da
RCS Update and Tweaks
2015-09-20 03:09:18 -04:00
f41f0a59fe
Guns update
2015-09-14 04:05:20 +02:00
84b42c5491
Merge pull request #1986 from Fox-McCloud/nuke-and-tator
...
Nuke Ops and Traitor Update+Balance
2015-09-10 02:24:32 +02:00
1c6c733a52
Nuke Ops and Traitor Update+Balance
2015-09-08 19:38:30 -04:00
1d7ecf48ff
Adds Mining Voucher to QM's locker
2015-09-08 12:53:57 -04:00
f3ba11fbda
Adds Warden Corporate and HoS Corporate Uniforms to Appropriate Lockers
2015-09-04 15:49:27 -04:00
e2347866a8
Merge pull request #1926 from Markolie/lordoftheflies
...
Make lockers use forceMove()
2015-09-02 15:58:09 -04:00
8d7bd64a00
Make lockers use forceMove()
2015-09-01 18:49:19 +02:00
7f4ac72910
Progress bars + Wall Rationalization
...
This commit does the following:
- Ports progress bars from -tg- (tgstation/-tg-station#9921 )
- Refactors wall attackby code to make it 100% less insane; Instead of
manually checking every little thing, it uses do_after,
consequentially, making the new progress bars affect dealing with walls
as well.
Wall code makes a tiger sad.
2015-08-31 13:38:51 -07:00
78950ec682
tweak 2.0
2015-08-05 20:12:11 -04:00
ab083aff50
Mining Fixes
2015-07-30 17:01:59 -04:00
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
057c15982e
Re-adds Security Helmets to Officer's Lockers
2015-07-11 10:10:57 -04:00
412443dbf1
Fix non-icon merge conflicts
2015-07-10 19:57:59 -04:00
916f9bf4bb
Sort of compiles
...
Time to fix xenoarch, and then the map.
2015-07-09 15:55:36 -04:00
0dbea7621f
The Great Del() Cull of 2015
2015-07-09 02:48:34 -04:00
a89ddd5a7d
Adds in Ether
2015-06-28 20:39:26 -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
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
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
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
8e450f99c8
tweaks and optimization
2015-06-21 02:16:18 -04:00
cbc9458379
Merge pull request #1331 from TheBeoni/Brig-Phys
...
Brig Doctor Jumpsuit.
2015-06-17 23:02:06 -04:00
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
060318cb29
Adds Deer ;D
2015-06-15 18:50:39 -05:00
8a78887ba6
Blueshield Jacket Re-submission
2015-06-14 14:23:55 -04:00
Fox-McCloud