bd07ff4bf7
This should be the one!
2019-11-21 18:55:43 +00:00
2b8ea0f7a6
Whoops
...
Fixes a typo
2019-11-21 19:14:38 +01:00
4974400ccb
Merge branch 'master' into xantholne-berets01
2019-11-21 11:01:42 -07:00
edd1946bf9
Changes code as requested by kev
...
Very very light knockdown for the clock spearthrow, CLAMPed values for everything that used a += (including the blood stun used on normal people), removed the vars as they were deemed unneccessary by kev so the values were moved directly to the debuff effects.
2019-11-21 17:20:33 +01:00
00bffba7ea
Why do surgeries always end up with jank
2019-11-21 15:57:21 +00:00
46076c95c7
Ghommie is a good friend
2019-11-21 14:22:04 +00:00
8256a206cf
Update code/modules/surgery/emergency_cardioversion_recovery.dm
...
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
2019-11-21 13:24:57 +00:00
29ae9eb962
Added reagent IDs.
2019-11-21 12:52:49 +01:00
2ced7db508
Ported a bunch of tg hydroponic stuff.
2019-11-21 10:53:57 +01:00
bfeece4c6e
fixing a get_idcard runtime. The betrayal of the ?.
2019-11-21 09:23:05 +01:00
ee73806616
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit352
2019-11-21 09:18:14 +01:00
a95b78af52
Update code/modules/antagonists/clockcult/clock_structures/traps/brass_skewer.dm
...
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
2019-11-21 00:52:52 -06:00
6a0bd7c925
THE REVENGE OF THE WHITESPACES
2019-11-21 07:40:49 +01:00
5153ed04ec
aaa
2019-11-21 06:48:26 +01:00
911a33bfd6
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit387
2019-11-21 06:36:59 +01:00
dccb3c2e22
part 3
2019-11-21 06:36:22 +01:00
71b3b8fdc6
Ports/Adds new Berets
...
Ports some berets adds even more to most jobs
2019-11-20 22:21:20 -07:00
c22ae596fc
Merge pull request #9880 from Putnam3145/meteor-random-fix
...
Makes sure every dynamic-triggered event isn't random on dynamic
2019-11-20 22:12:42 -07:00
1efd3ae395
Merge pull request #9866 from Useroth/tatorstrangeseeds
...
Adds strange seeds as a buyable traitor botanist item.
2019-11-20 22:09:53 -07:00
30aefd050a
Merge pull request #9868 from Ghommie/Ghommie-cit376
...
Fixes superlube waterflower.
2019-11-20 22:08:54 -07:00
60def2a9fc
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into wintergalorefix
2019-11-21 13:08:23 +08:00
8d363b8e9d
Merge pull request #9323 from Citadel-Station-13/kevinz000-patch-85
...
adds poll ignore for magical antagonists
2019-11-20 23:03:39 -06:00
0300927974
Merge pull request #9487 from Citadel-Station-13/spooky
...
adds an easy way for admins to force enable halloween races without the rest of halloween's code
2019-11-20 23:00:09 -06:00
56d2c0edad
Merge pull request #9681 from Citadel-Station-13/kevinz000-patch-107
...
buffs bluespace apprentice (targeted teleport --> blink)
2019-11-20 22:55:21 -06:00
28190bc168
Merge pull request #9703 from Citadel-Station-13/kevinz000-patch-109
...
emagged medibots now murder the everloving fuck out of slimepeople
2019-11-20 22:52:11 -06:00
df11e75414
Merge pull request #9718 from Citadel-Station-13/kevinz000-patch-110
...
fixes a bug with rnd multiprinting
2019-11-20 22:51:32 -06:00
6d889e66c4
Merge pull request #9720 from Citadel-Station-13/kevinz000-patch-111
...
Is it the time of year to buff disablers again?
2019-11-20 22:51:11 -06:00
8df8acb1b7
Merge pull request #9811 from Ghommie/Ghommie-cit353
...
Dreamchecker compatibility changes, part 2.
2019-11-20 21:49:58 -07:00
c503e564db
Merge pull request #9873 from Ghommie/Ghommie-cit378
...
Fixing aux-base construction RCD door access settings menu and reverting another non-functional bit
2019-11-20 21:48:41 -07:00
47888bd208
Merge pull request #9877 from Ghommie/Ghommie-cit381
...
Unmodularize pAI holo-chassis icons.
2019-11-20 21:47:00 -07:00
f82dd255dc
Merge pull request #9869 from Hatterhat/ayy-dna-manip
...
what if i gave botanists the ability to get the fancy alien dna manipulator. haha, just kidding. ...unless?
2019-11-20 21:46:37 -07:00
25efd11d9a
Update code/modules/projectiles/projectile/energy/stun.dm
...
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
2019-11-20 21:44:17 -07:00
b911fabb37
Okay bedtime
2019-11-21 04:25:25 +00:00
18e1246fd0
Classic fixes
2019-11-21 03:16:18 +00:00
c40cad1658
Starting an explosion rework, fun fun
2019-11-20 19:01:59 -08:00
cc53a0061f
Well it compiles
2019-11-21 02:15:58 +00:00
bfb5f75016
Finishing up final UI adjustments
2019-11-20 21:23:54 +00:00
ab846bc584
Update stun.dm
2019-11-20 13:54:57 -07:00
920eba0b03
ayy
2019-11-20 21:41:59 +01:00
aab7ad192b
Martial arts pacifism fixes and boxing buff, more ported pacifist fixes.
2019-11-20 21:00:17 +01:00
ac44bfcad2
chem dispenser beakers and bikehorn fixes.
2019-11-20 17:55:11 +01:00
5395e0c893
meme
2019-11-20 10:35:40 -06:00
b91d0e27da
An alternative solution to the problems with blackpowder.
2019-11-20 15:49:04 +01:00
2a8152c835
Applied suggestions.
2019-11-20 15:15:10 +01:00
ebe3859cc5
syncs size
2019-11-20 13:28:35 +00:00
4dd8223634
Undoes circuitboards and converts to sleeper.
2019-11-20 11:58:06 +00:00
48e1c64c8d
Final
2019-11-20 11:35:40 +00:00
a3aa70be75
Tweaks, and such
...
Tweaks many cargo packs, and fixes a few issues
Sneak peak into the kilm as well
2019-11-20 06:02:06 -05:00
0d297e92c7
read words
2019-11-19 22:02:06 -08:00
f7361c2059
Made sure every dynamic-controlled event doesn't randomly trigger on dynamic.
2019-11-19 21:58:55 -08:00
Thalpy