Commit Graph

25879 Commits

Author SHA1 Message Date
tigercat2000
6573daf8d5 Merge pull request #7440 from Aurorablade/Cutouts
Ports Cardboard cutouts
2017-06-07 11:13:04 -07:00
Aurorablade
e1d75457dc references.. 2017-06-07 00:51:33 -04:00
tigercat2000
23ee362996 Merge pull request #7471 from Kyep/instagib_fix
Tweaks instagib lasers
2017-06-06 14:40:14 -07:00
Fox McCloud
0b342a0156 Merge pull request #7439 from DarkPyrolord/inconsistentvamps
Allows for plasma-pires
2017-06-06 16:43:20 -04:00
tigercat2000
52f715e905 Merge pull request #7448 from Fox-McCloud/origin-tech-tweak
Fixes/Tweaks Old Origin Techs
2017-06-06 13:42:20 -07:00
tigercat2000
bbb8d883e5 Merge pull request #7235 from FlattestGuitar/midnight-fluffles
Fluffs
2017-06-06 12:43:09 -07:00
Fox McCloud
b6e68ef296 Merge pull request #7481 from tigercat2000/weird_bug
Misc. Fixes
2017-06-06 15:25:14 -04:00
Kyep
ee2eb3eb4b Fox request 2017-06-05 22:07:06 -07:00
tigercat2000
0365dcb2a2 Fix admin control_freak setting 2017-06-05 18:21:08 -07:00
imsxz
957ef0583f Update pet.dm 2017-06-05 17:18:58 +02:00
Kyep
ed3d8cb278 Tweaks instagib lasers
Instagib lasers now work on non-carbon mobs (such as simple_animals),
and turfs.

No CL, as admin-only.
2017-06-05 03:55:08 -07:00
Aurorablade
ec3af5684d Its late 2017-06-04 03:53:23 -04:00
Crazylemon64
ca7a156c99 Cloning no longer stops the heart
Also fixes a runtime regarding emptying an EMP'd clone pod
2017-06-04 00:32:03 -07:00
Aurorablade
4d775a70a5 syndiekit update 2017-06-04 02:48:34 -04:00
Aurorablade
3b5e6e4ff5 fixes 2017-06-03 22:01:00 -04:00
imsxz
11cfa495ff Fixes IAA listed twice in traitor.dm 2017-06-03 16:27:01 -04:00
FlattestGuitar
92eb5d458a typos 2017-06-03 20:08:27 +02:00
Fox-McCloud
e0ea07fc86 Fixes/Tweaks Old Origin Techs 2017-06-03 12:11:46 -04:00
Aurorablade
2b85c80464 well they COULD be demons... 2017-06-03 01:03:02 -04:00
Aurorablade
4df3e02190 adds a terrror spider. 2017-06-02 23:27:55 -04:00
Aurorablade
69e373bbfa ops need this. 2017-06-01 22:18:05 -04:00
Aurorablade
72c874fd50 What deathsquad? 2017-06-01 21:32:07 -04:00
Fox McCloud
3922f5957f Merge pull request #7379 from tigercat2000/science_refactor
RnD autolathe removal + tech level overhaul
2017-06-01 21:16:26 -04:00
Aurorablade
cf0db6792f tochat fix 2017-06-01 20:59:00 -04:00
Aurorablade
952f6ffd0b itsucanny 2017-06-01 20:02:44 -04:00
DarkPyrolord
658a5215c6 Easy fix 2017-06-02 08:43:33 +12:00
tigercat2000
633c972f46 RnD autolathe removal + tech level overhaul 2017-06-01 11:34:29 -07:00
Fox McCloud
19efd26f5b Merge pull request #7414 from SamHPurp/add-table-build-time
Adds a build-time table construction
2017-06-01 14:31:34 -04:00
Fox McCloud
4b47f38ac9 Merge pull request #7413 from Kyep/ert_money
ERTs are no longer bankrupt
2017-06-01 14:03:35 -04:00
Fox McCloud
10fdb35045 Merge pull request #7401 from GuppyLaxx/helmet-1
Makes plasmaman engineering/atmos helmets weld/flash proof
2017-05-31 23:17:44 -04:00
FalseIncarnate
9c78ab19bf just in case 2017-05-31 17:18:23 -04:00
FalseIncarnate
5ca1e05cf3 Fixes non-crossbreeding fish only laying duds
Shrimp and electric eels will now properly lay eggs of their type if
another of their species is in the tank with them. They will lay duds if
they are the only one of their species present as normal, or if another
fish attempts to crossbreed with them.
2017-05-31 17:11:44 -04:00
Fox McCloud
f622d50877 Merge pull request #7394 from Xantholne/LoadoutChanges
Loadout Requirement Fixes
2017-05-31 16:30:05 -04:00
Crazy Lemon
1204c17520 Merge pull request #7423 from Fruerlund/pdapens
CTRL Click on PDA's will now pull pens
2017-05-30 15:48:12 -07:00
Fruerlund
cf6f963459 Fixes requested changes
Fixes usr's to users and should be properly passing arguments
2017-05-30 20:53:00 +02:00
Xantholne
4028696cca Removed CMO and MD from VIro Skirt. Removed Viro and Chemist from MD Skirt Removed MD from Chemist Skirt 2017-05-29 22:31:09 -06:00
GuppyLaxx
0c3199bba9 Makes it only for CE/Atmos tech/Engineeer 2017-05-29 19:17:22 -04:00
tigercat2000
f1a238f6de Merge pull request #7390 from Tayyyyyyy/targeting_mode
Visibly message when someone points a gun at something
2017-05-29 14:46:33 -07:00
Fox McCloud
6326115b61 Merge pull request #7405 from SamHPurp/SUPER-HIGH-PRIORITY-TWEAK-GAME-BREAKING-ARGHH
<span class='reallybig'>WHY ARE MEGAPHONES TINY ITEMS</span>
2017-05-29 16:30:33 -04:00
Fox McCloud
d9b409c0de Merge pull request #7399 from SamHPurp/shrinks-encryption-keys
Classes encryption keys as 'small' items
2017-05-29 16:30:21 -04:00
Fruerlund
bdf8323be6 Adds PEN removal shortcut
You can now remove pens from PDAs with CTRL click
2017-05-29 22:19:03 +02:00
FlattestGuitar
ce5d7eccdb Merge branch 'master' into midnight-fluffles 2017-05-29 15:37:40 +02:00
Sam
84b8bf1159 racks too, what the hell 2017-05-29 03:23:35 +01:00
Kyep
d1db75b555 ERTs are no longer bankrupt
ERTs now get bank accounts during their creation.
This prevents situations where the ERT is equipped with the latest
military gear, but is so penniless they can't afford a coffee from a
vending machine. More importantly, it means they won't starve if the
chef isn't making food (which, in a lot of ERT-worthy situations, they
aren't).
2017-05-28 19:07:16 -07:00
Sam
2352777bf8 nerfs IKEA 2017-05-29 02:59:26 +01:00
tigercat2000
7a75be6287 Merge pull request #7407 from Fox-McCloud/movement-fixes
Movement fixes
2017-05-28 11:49:50 -07:00
Fox McCloud
1c21d8eb98 Merge pull request #7403 from SamHPurp/Punching-above-its-weight
Refactoring to use the WEIGHT_CLASS defines.
2017-05-28 14:17:05 -04:00
tigercat2000
ef464b5ecd Merge pull request #7409 from SamHPurp/one-click-antag-logging
Adds logs to the use of One-Click-Antag admin buttons
2017-05-28 11:09:59 -07:00
Sam
249dacf136 Logs use of one-click-antag 2017-05-28 18:53:57 +01:00
Fox-McCloud
2501e6a5e8 tweaks 2017-05-28 11:13:39 -04:00