lolman360
7048e4e5ab
hhh
2019-12-21 12:43:48 +11:00
lolman360
b02ffa2e2d
Update inhand_holder.dm
2019-12-21 12:40:41 +11:00
lolman360
6188ec034d
h
2019-12-20 16:10:13 +11:00
lolman360
e8dc9480b0
AAAAAAAAAAAAAAAAAAAA
2019-12-19 18:30:38 +11:00
lolman360
d8f0e983f1
lolman acctually knows how the stuff work
2019-12-19 18:24:24 +11:00
lolman360
8fc095d63e
Update carbon.dm
2019-12-19 17:29:35 +11:00
lolman360
08e1ab7b21
f
2019-12-06 16:11:41 +11:00
lolman360
dec79a9ba3
gg
2019-12-06 15:55:52 +11:00
lolman360
dc1c17226d
Merge branch 'master' into HeadCorgi
2019-11-28 08:45:19 +11:00
kevinz000
ccfdb74508
Merge pull request #9882 from FestiveBall/Fersi
...
[READY] Allows addition of reagents to sleepers for injection and detection of failed organs (minor GUI tweak.)
2019-11-26 16:02:42 -07:00
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
kevinz000
8b56e25d97
Merge pull request #9920 from YakumoChen/ai-sprites
...
Ports a bunch of VG's AI sprites
2019-11-26 15:59:09 -07:00
YakumoChen
0b9ea6c7f0
no pedoing the AI
2019-11-26 19:58:25 +00: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
BlackMajor
c81d1fe7a3
Merge pull request #9867 from Ghommie/Ghommie-cit375
...
Ports "examine-code refactor"
2019-11-25 11:31:03 +13:00
BlackMajor
47b5dbeaaa
Merge pull request #9625 from Ghommie/Ghommie-cit277
...
Unmodularize digi/muzzled clothing sprites.
2019-11-25 11:30:31 +13:00
Fermi
99e9c606c0
I dunno what I did but it's fixed... somehow.
2019-11-24 04:03:51 +00: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
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
8ea6618f5d
Revert "ARGH"
...
This reverts commit f0f52ce3f8
2019-11-24 03:01:59 +00:00
Fermi
f0f52ce3f8
ARGH
2019-11-24 02:55:50 +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
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
kevinz000
f0996208a3
Merge pull request #9874 from Ghommie/Ghommie-cit379
...
Honkbot slip and slide fun ride.
2019-11-23 11:49:32 -07:00
kevinz000
f88ed98ee4
Merge pull request #9909 from kiwedespars/anthromorphic-insect-revert
...
Anthromorphic Insect Revert
2019-11-23 11:44:52 -07:00
Lin
e954cec58c
Merge pull request #9898 from Ghommie/Ghommie-cit387
...
Dreamchecker compatibility changes, part 3.
2019-11-23 05:52:44 +00:00
YakumoChen
1c8b557466
fixes AI.dm again
2019-11-23 04:13:30 +00:00
YakumoChen
6426e5dade
makes the icons not break
2019-11-23 03:54:39 +00:00
YakumoChen
a6ff44782a
adds more unique ai holograms
2019-11-23 03:51:04 +00:00
Fermi
b404e18b15
Merge branch 'master' into FERMICHEMCurTweaks
2019-11-23 00:10:33 +00:00
GrayRachnid
77913406ed
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into disablesnolegs
2019-11-22 18:50:24 -05:00
Putnam3145
b7f7342e43
Merge pull request #9900 from Ghommie/Ghommie-cit388
...
fixing a get_idcard runtime. or The betrayal of the ?. operator
2019-11-22 15:41:52 -08: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
Ghommie
7d3599b2f9
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit277
2019-11-22 18:53:58 +01:00
lolman360
216790d442
Merge branch 'master' into HeadCorgi
2019-11-22 21:54:05 +11:00
kiwedespars
98998ca85f
un-moths the anthromorphic insects
2019-11-21 19:47:48 -08:00
Lin
522a664f55
Merge pull request #9887 from Ghommie/Ghommie-cit385
...
Martial arts pacifism fixes and boxing buff, more ported pacifist fixes.
2019-11-22 02:39:29 +00:00
Lin
1ddb9935ff
Merge pull request #9530 from Ghommie/Ghommie-cit245
...
Touching up job outfits equip procs, little PDA fix.
2019-11-22 02:37:49 +00:00
Ghommie
bfeece4c6e
fixing a get_idcard runtime. The betrayal of the ?.
2019-11-21 09:23:05 +01:00
Ghommie
6a0bd7c925
THE REVENGE OF THE WHITESPACES
2019-11-21 07:40:49 +01:00
Ghommie
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
