8a8f244d3f
Remove unneeded args
2018-05-15 01:15:27 -07:00
fea1dada3a
Restore Pun Pun
2018-05-14 22:31:05 -07:00
64a895d6f1
Merge pull request #9003 from Kyep/monkey_business_2
...
Fixes snacks.dm runtime and monkey bug
2018-05-10 19:30:29 -07:00
e7653b578b
Tiger request
2018-05-10 00:06:17 -07:00
6c47553fcd
Fixes snacks.dm runtime and monkey bug
2018-05-09 23:57:47 -07:00
6f63e8b4b9
Fix Aurora Caelus spelling and grammar. Fixes #8945
2018-05-09 19:03:49 -05:00
254cdd6055
Merge pull request #8972 from Fox-McCloud/power-cell
...
Power Cell Code Cleanup
2018-05-09 11:26:03 -07:00
28c0302fb4
Merge pull request #8991 from RyanSmake/fuckingfaxes
...
Fax machines are no longer photocopiers
2018-05-09 11:23:29 -07:00
aedece7207
Merge pull request #8989 from Kyep/nations_etc_borg_runtime
...
Fixes #8271 - rare borg runtimes
2018-05-09 11:22:04 -07:00
7d4fb45509
Merge pull request #8947 from tigercat2000/more_ss_ports
...
SS Conversion: Atoms, Machines, n' Mobs
2018-05-07 17:54:49 -04:00
f1a71a02fc
Fax machines are no longer photocopiers
2018-05-07 22:04:36 +02:00
a6d06ea397
Fixes #8271 - rare borg runtimes
2018-05-06 22:21:35 -07:00
f0f540b839
Merge pull request #8978 from TravellingMerchant/Fluffupdate
...
Changes Merchants Fluff item.
2018-05-06 12:37:29 -07:00
c78075414c
Merge pull request #8488 from Kyep/ds_tweaks
...
Tweaks Deathsquad
2018-05-04 19:03:54 -07:00
05e0901967
removes anti-drop implants
2018-05-04 18:36:56 -07:00
662d7f34e2
Merge pull request #8949 from Kyep/tsf_marines
...
Solar Federation Outfit Fixes/Tweaks
2018-05-04 12:50:38 -07:00
6e846018cd
Performs inquisition on ATMs
2018-05-04 19:36:54 +02:00
e812cae73f
Updates Merchants Fluff item.
2018-05-04 16:33:00 +01:00
8071b42308
Merge remote-tracking branch 'upstream/master' into more_ss_ports
...
# Conflicts:
# code/modules/food_and_drinks/food/snacks.dm
2018-05-03 19:30:41 -07:00
5243c254ac
Update monkey cubes
2018-05-03 19:28:35 -07:00
ee538b25d5
Monkey business logging
2018-05-02 17:02:24 -07:00
8bd042240f
Power Cell Code Cleanup
2018-05-02 19:35:18 -04:00
1a00cbdcf9
Actually Fixes Chem Smoke
2018-05-02 00:14:32 -04:00
0c6cbbc5c3
Merge pull request #8959 from Fox-McCloud/remove-things
...
Removes Programmable Unloaders and a Few Unused Files
2018-05-01 14:07:12 -07:00
cacde22a27
Readd human/New warning about excessive arguments
2018-04-30 09:36:22 -07:00
7fb8f8d76c
Merge remote-tracking branch 'upstream/master' into more_ss_ports
...
# Conflicts:
# paradise.dme
2018-04-30 09:27:11 -07:00
f28285e16f
further checks
2018-04-30 04:42:57 -04:00
ee6a156ca2
Removes Programmable Unloaders and a Few Unused Files
2018-04-30 00:41:26 -04:00
3c1fbf9cc5
Merge pull request #8938 from Fox-McCloud/guillotine
...
Ports Guillotine
2018-04-29 20:28:50 -07:00
63e2a175fd
Merge remote-tracking branch 'upstream/master' into timer-subsystem
2018-04-29 21:14:11 -04:00
4f39ee73c8
Merge pull request #8936 from Fox-McCloud/tg-blast-cannon
...
Ports TG's Blastcannon
2018-04-29 18:13:16 -07:00
2163e43b53
Merge pull request #8957 from Fox-McCloud/fix-plastic
...
Fixes Plastic Recipe
2018-04-29 18:03:41 -07:00
c73a6b237d
logging
2018-04-29 21:03:31 -04:00
49195e4f3e
Merge pull request #8941 from Anasari/kittyears
...
Add kitty ears to load out
2018-04-29 17:56:19 -07:00
3271a6270c
Merge pull request #8956 from Fox-McCloud/oh-noooo
...
Does Surgery on Surgery to Fix Surgery
2018-04-29 17:55:47 -07:00
cd8c38bb40
Fixes Plastic Recipe
2018-04-29 20:54:18 -04:00
f7181df136
Does Surgery on Surgery to Fix Surgery
2018-04-29 20:41:37 -04:00
94aa18ceda
E.L.O. Fluff Item
...
Adds E.L.O.'s fluff item: a personalized medical beret.
Ckey: `V-Force_Bomber`
Character Name: `E.L.O.`
2018-04-29 12:32:26 -04:00
da2122626a
TSF marine update
2018-04-29 01:45:13 -07:00
278e6a7c25
the last of the TIMER_STOPPABLE
2018-04-29 01:12:57 -04:00
510c5b4268
fixes
2018-04-29 00:53:13 -04:00
7d8c9a731a
SS Conversion: Atoms, Machines, n' Mobs
...
This converts the machine and mob processes to the SMC. Additionally, it
adds the Atom subsystem, which handles all Initialize() calls in place
of the old gameticker. Due to incompatibility with our atmospherics
(FUCK OUR ATMOSPHERICS FOR FUCKING EVER JESUS CHRIST WHO THE FUCK MADE
THIS PIECE OF GODDAMN SHIT) atmospherics machines do not use
Initialize() as they should, instead opting for a custom atmos_init
proc that the air controller handles.
2018-04-28 17:55:15 -07:00
cfe182a1f7
Ports over Timer Subsystem
2018-04-28 20:26:04 -04:00
cf307b6217
Add kitty ears to load out
2018-04-28 12:07:35 +08:00
dabdbd4426
Merge pull request #8929 from Aurorablade/MagicalPlasma
...
Tries to fix plasma wizards
2018-04-27 17:06:49 -07:00
8f5f57dd0b
adds clapping
2018-04-27 19:27:47 -04:00
b238dfc581
Ports Guillotine
2018-04-27 18:58:23 -04:00
3dd1a8861d
Ports TG's Blastcannon
2018-04-27 07:22:55 -04:00
21aa88ca59
missing thing
2018-04-26 18:55:55 -04:00
608a4531ff
Merge pull request #8924 from Fox-McCloud/ORM-refactor
...
ORM Refactor
2018-04-26 14:55:26 -07:00
Tayyyyyyy