6188ec034d
h
2019-12-20 16:10:13 +11:00
e8dc9480b0
AAAAAAAAAAAAAAAAAAAA
2019-12-19 18:30:38 +11:00
d8f0e983f1
lolman acctually knows how the stuff work
2019-12-19 18:24:24 +11:00
8fc095d63e
Update carbon.dm
2019-12-19 17:29:35 +11:00
08e1ab7b21
f
2019-12-06 16:11:41 +11:00
dec79a9ba3
gg
2019-12-06 15:55:52 +11:00
dc1c17226d
Merge branch 'master' into HeadCorgi
2019-11-28 08:45:19 +11:00
8cec8fa506
Automatic changelog generation for PR #9906 [ci skip]
2019-11-26 20:26:21 -06:00
2aa0211121
Merge pull request #9906 from Xantholne/xantholne-berets02
...
[Ready] Ports/Adds new berets but I don't break the branch somehow
2019-11-26 19:26:18 -07:00
65bec77c5a
Automatic changelog generation for PR #9882 [ci skip]
2019-11-26 17:02:45 -06:00
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
d79fba2838
Automatic changelog generation for PR #9268 [ci skip]
2019-11-26 17:01:51 -06:00
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
4c2a7597cc
Automatic changelog generation for PR #9920 [ci skip]
2019-11-26 16:59:11 -06:00
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
0b9ea6c7f0
no pedoing the AI
2019-11-26 19:58:25 +00:00
65db2b2160
Merge conflicts
2019-11-25 20:19:57 -07:00
4e20f576e6
Merge branch 'master' into xantholne-berets02
2019-11-25 20:16:15 -07:00
495b4b6ddc
Fixes some issues
2019-11-25 20:13:07 -07:00
56bdb36058
Automatic changelog generation for PR #9942 [ci skip]
2019-11-25 06:39:22 -06:00
8219d298a5
Merge pull request #9942 from Useroth/new-tg-plants
...
[Hotfix] Fixed the reagents in the new plants.
2019-11-25 04:39:20 -08:00
99300229a1
Fixed the reagents in the new plants.
2019-11-25 13:35:26 +01:00
e4dce88761
Automatic changelog generation for PR #9922 [ci skip]
2019-11-24 17:31:17 -06:00
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
0b60d5e6ef
derp
2019-11-24 17:48:09 -05:00
453bb6ca32
Automatic changelog generation for PR #9867 [ci skip]
2019-11-24 16:31:05 -06:00
c81d1fe7a3
Merge pull request #9867 from Ghommie/Ghommie-cit375
...
Ports "examine-code refactor"
2019-11-25 11:31:03 +13:00
315082fc91
Automatic changelog generation for PR #9902 [ci skip]
2019-11-24 16:30:45 -06:00
6f98efb18e
Merge pull request #9902 from Useroth/new-tg-plants
...
[TESTMERGE READY] Ported a bunch of tg hydroponics content.
2019-11-25 11:30:43 +13:00
47b5dbeaaa
Merge pull request #9625 from Ghommie/Ghommie-cit277
...
Unmodularize digi/muzzled clothing sprites.
2019-11-25 11:30:31 +13:00
18e7e85e87
Automatic changelog generation for PR #9907 [ci skip]
2019-11-24 14:01:39 -06:00
7481661182
Merge pull request #9907 from Putnam3145/midround-Vr-fix
...
[DYNAMIC] Prevents VR mobs from being midround antags.
2019-11-24 20:01:36 +00:00
6a59cc1c99
Added missing jupitercup mycelium icon. Added a mutation path for galaxythistle.
2019-11-24 10:14:16 +01:00
99e9c606c0
I dunno what I did but it's fixed... somehow.
2019-11-24 04:03:51 +00:00
614a462176
Revert "Revert "Merge remote-tracking branch 'upstream/master'""
...
This reverts commit 1509d9d183
2019-11-24 03:33:02 +00:00
ba4fa1ef67
Revert "PLASE"
...
This reverts commit 8af225e6e3
2019-11-24 03:06:08 +00:00
aeb8606ce0
Revert "Revert "PLASE""
...
This reverts commit 00601a0c87
2019-11-24 03:04:52 +00:00
25fe5ec14b
Revert "Revert "Alright""
...
This reverts commit 505e15a3e1
2019-11-24 03:04:37 +00:00
1df097b8ed
Revert "Revert "hark""
...
This reverts commit f4b54f15d2
2019-11-24 03:04:31 +00:00
f03b90f2e2
Revert "Revert "I can't spell""
...
This reverts commit 3d713b6c96
2019-11-24 03:04:30 +00:00
2501b5c88c
Revert "Revert "Okay""
...
This reverts commit fb2c29caff
2019-11-24 03:04:27 +00:00
6729a62200
Revert "Revert "Well""
...
This reverts commit df5814c30e
2019-11-24 03:04:25 +00:00
994c01c8ec
Revert "Revert "Trust your insincts""
...
This reverts commit 82c3e3cd9d
2019-11-24 03:04:23 +00:00
3155e3ffb3
Revert "Revert "Removes the random love""
...
This reverts commit ce7e9ac452
2019-11-24 03:04:20 +00:00
1509d9d183
Revert "Merge remote-tracking branch 'upstream/master'"
...
This reverts commit 135608551fce7e9ac452
2019-11-24 03:04:13 +00:00
c8b206a4cf
Revert "pls"
...
This reverts commit 8c97511871
2019-11-24 03:04:04 +00:00
4c1c257035
Revert "Revert "pls""
...
This reverts commit b23f2a4460
2019-11-24 03:02:21 +00:00
9eaed4ea8e
Revert "pls2"
...
This reverts commit 0eb635b908
2019-11-24 03:02:04 +00:00
8ea6618f5d
Revert "ARGH"
...
This reverts commit f0f52ce3f8
2019-11-24 03:01:59 +00:00
cb4bfa65d1
Revert "?"
...
This reverts commit 05d18171e0
2019-11-24 03:01:55 +00:00
lolman360