kevinz000
6b53845f06
Merge pull request #9268 from Thalpy/FERMICHEMCurTweaks
...
[READY] [Please merge me] Fermichem tweaks: Purity, Astral, RNG, MK, SMilk, SDGF, furranium, hatmium, eigen, nanite.
2019-11-26 16:01:48 -07:00
BlackMajor
786d40032d
Merge pull request #9922 from GrayRachnid/braintraumasport
...
Ports new Brain Traumas from /tg/. Does not include the shitty creeper antag or Wizard Traumas, i'm porting wizard traumas later. Also adds the Desynchronizer and changes the way some heaRing args are handled.
2019-11-25 12:31:15 +13:00
GrayRachnid
0b60d5e6ef
derp
2019-11-24 17:48:09 -05:00
BlackMajor
c81d1fe7a3
Merge pull request #9867 from Ghommie/Ghommie-cit375
...
Ports "examine-code refactor"
2019-11-25 11:31:03 +13:00
Fermi
614a462176
Revert "Revert "Merge remote-tracking branch 'upstream/master'""
...
This reverts commit 1509d9d183
2019-11-24 03:33:02 +00:00
Fermi
ba4fa1ef67
Revert "PLASE"
...
This reverts commit 8af225e6e3
2019-11-24 03:06:08 +00:00
Fermi
aeb8606ce0
Revert "Revert "PLASE""
...
This reverts commit 00601a0c87
2019-11-24 03:04:52 +00:00
Fermi
2501b5c88c
Revert "Revert "Okay""
...
This reverts commit fb2c29caff
2019-11-24 03:04:27 +00:00
Fermi
1509d9d183
Revert "Merge remote-tracking branch 'upstream/master'"
...
This reverts commit 135608551fce7e9ac452
2019-11-24 03:04:13 +00:00
Fermi
c8b206a4cf
Revert "pls"
...
This reverts commit 8c97511871
2019-11-24 03:04:04 +00:00
Fermi
4c1c257035
Revert "Revert "pls""
...
This reverts commit b23f2a4460
2019-11-24 03:02:21 +00:00
Fermi
9eaed4ea8e
Revert "pls2"
...
This reverts commit 0eb635b908
2019-11-24 03:02:04 +00:00
Fermi
0eb635b908
pls2
...
ugh
2019-11-24 02:52:17 +00:00
Fermi
b23f2a4460
Revert "pls"
...
This reverts commit 8c97511871
2019-11-24 02:49:20 +00:00
Fermi
8c97511871
pls
...
ugh
2019-11-24 02:47:52 +00:00
Fermi
135608551f
Merge remote-tracking branch 'upstream/master'
2019-11-24 02:45:28 +00:00
Fermi
fb2c29caff
Revert "Okay"
...
This reverts commit 37ac0ccb66
2019-11-24 02:44:32 +00:00
Fermi
00601a0c87
Revert "PLASE"
...
This reverts commit 8af225e6e3
2019-11-24 02:44:00 +00:00
Fermi
8af225e6e3
PLASE
2019-11-24 02:41:21 +00:00
Fermi
37ac0ccb66
Okay
2019-11-23 00:23:43 +00:00
Fermi
b404e18b15
Merge branch 'master' into FERMICHEMCurTweaks
2019-11-23 00:10:33 +00:00
GrayRachnid
a7918717ff
fixes compile errors.
2019-11-22 18:22:53 -05:00
GrayRachnid
c8e52fb8e1
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into disablesnolegs
2019-11-22 15:24:15 -05:00
nik707
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
kevinz000
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
Hatterhat
f161b01f6b
ayytech plants
2019-11-19 17:26:44 -06:00
Ghommie
dd101ef221
Part 2
2019-11-19 18:00:56 +01:00
Ghommie
6d6cc93e50
Ports "Self sustaining fix"
2019-11-17 02:59:38 +01:00
kevinz000
21775ad3ee
Merge pull request #9813 from Ghommie/Ghommie-cit355
...
Ports "Ghosts can now see the AI's camera" and "Removes error message while shunting [fix]"
2019-11-16 01:24:58 -07:00
kevinz000
02e8a73265
Merge pull request #9737 from Ghommie/Ghommie-cit326
...
Ports techweb backend refactor & co.
2019-11-14 16:45:09 -07:00
kevinz000
4c89b8c33f
Merge pull request #9628 from Trilbyspaceclone/Cargo_MKII
...
[Ready] [Testmerge] MK II Cargo Rework - Sell harder edition
2019-11-14 16:00:45 -07:00
kevinz000
dfa2296758
Merge pull request #9430 from Ghommie/Ghommie-cit220
...
Ports "Adds three new .38 ammo types", also lazily adding .357 AP
2019-11-14 15:44:59 -07:00
Ghommie
98bc6d6c60
Ports "Ghosts can now see the AI's camera" and "Removes error message while shunting [fix]"
2019-11-14 23:33:37 +01:00
TrilbySpaceClone
ec57e28c17
Merge branch 'master' into Cargo_MKII
2019-11-13 08:00:24 -05:00
TrilbySpaceClone
6e328ea1b1
art of the deal
2019-11-11 07:26:12 -05:00
Ghommie
b2b1390bd3
Ports techweb backend refactor & co.
2019-11-07 05:07:38 +01:00
TrilbySpaceClone
0662245d80
corrections
2019-11-06 22:52:44 -05:00
Ghommie
a650e1e411
Ports "Renames is_hot and is_sharp to get_temperature and get_sharpness"
2019-11-05 05:37:28 +01:00
kevinz000
b9ee75bd3f
Update _production.dm
2019-11-04 20:03:40 -07:00
TrilbySpaceClone
82b148b7b7
Merge branch 'master' into Cargo_MKII
2019-11-03 17:53:06 -05:00
TrilbySpaceClone
bd4501e11c
the last touches?
2019-11-03 17:26:28 -05:00
TrilbySpaceClone
a8248c68f4
perhaps
2019-11-03 12:53:02 -05:00
TrilbySpaceClone
5c4cd15762
Hmm
2019-11-03 11:05:45 -05:00
Ghommie
b17346a44e
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit220
2019-10-30 14:46:42 +01:00
kevinz000
ae4aee794e
Merge pull request #9592 from Ghommie/Ghommie-cit262
...
Porting movespeed modification system updates.
2019-10-29 21:27:53 -07:00
Hatterhat
ebd05a3fb1
today i will make a one line fix and steal it from sishen
2019-10-28 22:39:46 -05:00
kevinz000
da387bfdf4
Merge pull request #9620 from YakumoChen/proto_beanbag
...
Adds Beanbag Slugs to Seclathe
2019-10-27 16:13:31 -07:00
kevinz000
dabfba8a0d
Merge pull request #9619 from BlackMajor/Yote
...
Buffs engiborg build potential
2019-10-27 05:38:50 -07:00
YakumoChen
325de79b3a
adds beanbag slug to starter node
2019-10-26 10:22:50 +00:00
YakumoChen
0845c6915e
adds beanbag to sec lathe
2019-10-26 10:19:01 +00:00
