deathride58
|
742d50b5e7
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into donoritemmodularization
# Conflicts:
# code/citadel/custom_loadout/custom_items.dm
# code/datums/components/riding.dm
# code/game/objects/items/implants/implantuplink.dm
# icons/mob/neck.dmi
# icons/obj/clothing/cloaks.dmi
|
2017-12-08 19:58:41 -05:00 |
|
deathride58
|
9715e9c685
|
Merge pull request #4232 from cebutris/borers
Removes borer event from rotation
|
2017-12-08 18:52:58 +00:00 |
|
Trevor Serpas
|
f37df9f0b5
|
Ghost defile removes salt piles (#33294)
Fixes #33291
|
2017-12-06 06:19:17 -06:00 |
|
cebutris
|
50a4f85cbb
|
removes it even harder
|
2017-12-05 16:03:03 -05:00 |
|
cebutris
|
701108d074
|
removes borer event from rotation
|
2017-12-05 15:56:23 -05:00 |
|
deathride58
|
f57e02ce95
|
Merge branch 'master' into donoritemmodularization
|
2017-12-04 20:17:02 -05:00 |
|
deathride58
|
858a9bf428
|
Merge pull request #4074 from Citadel-Station-13/upstream-merge-32624
[MIRROR] [READY]Refactors uplinks to a component!
|
2017-12-04 23:12:45 +00:00 |
|
deathride58
|
21d5e8999c
|
Merge branch 'master' into upstream-merge-32624
|
2017-12-04 17:12:53 -05:00 |
|
deathride58
|
64aadb868e
|
Merge branch 'master' into upstream-merge-33213
|
2017-12-04 21:39:30 +00:00 |
|
MoreRobustThanYou
|
29ba71765c
|
Datumizes saymodes
|
2017-12-03 12:56:03 -06:00 |
|
Ashe Higgs
|
5621507b4a
|
Adds emergency lights, built into light fixtures
|
2017-12-03 12:54:48 -06:00 |
|
AnturK
|
18c01d88c5
|
Fixes syndieborg spawner
|
2017-12-02 09:44:11 -06:00 |
|
deathride58
|
4eceef7693
|
Merge pull request #4155 from Citadel-Station-13/upstream-merge-32967
[MIRROR] Added bot path data huds
|
2017-11-30 04:34:25 +00:00 |
|
deathride58
|
34c9105396
|
Merge pull request #4165 from Citadel-Station-13/upstream-merge-33129
[MIRROR] Adds a new wizard magic suicide.
|
2017-11-29 03:29:37 +00:00 |
|
deathride58
|
5e2ca3235d
|
Merge pull request #4160 from Citadel-Station-13/upstream-merge-33112
[MIRROR] Fixes devilstuff
|
2017-11-29 03:26:51 +00:00 |
|
Shadowflame909
|
5bc059fbc8
|
Update artefact.dm (#33129)
Beep Beep more hard to get suicides are fun!
|
2017-11-28 19:06:24 -06:00 |
|
Jordan Brown
|
87c16e3939
|
Merge pull request #33112 from AnturK/devilfix
Fixes devilstuff
|
2017-11-28 06:29:25 -06:00 |
|
Cruix
|
b23c92b056
|
Added bot path data huds
|
2017-11-28 06:28:40 -06:00 |
|
ACCount
|
b15481c7cd
|
Removes some unused sprite files (#33121)
* Removes two unused sprite files
* Removes two more sprites
|
2017-11-28 06:28:23 -06:00 |
|
deathride58
|
1d8618eaca
|
Merge pull request #4139 from Citadel-Station-13/upstream-merge-33090
[MIRROR] Cleans up goldcore defines
|
2017-11-27 03:11:42 +00:00 |
|
deathride58
|
c4b3b99c99
|
Merge pull request #4141 from Citadel-Station-13/upstream-merge-33087
[MIRROR] Cleans up some qdel(src)'s in Initialize()
|
2017-11-27 02:37:07 +00:00 |
|
ShizCalev
|
5abd1bcdd9
|
Cleans up some qdel(src)'s in Initialize()
|
2017-11-26 20:15:18 -06:00 |
|
AnturK
|
c574b06f90
|
Fixes wizard greentext (#33088)
|
2017-11-26 16:53:58 -06:00 |
|
ShizCalev
|
4a22fed89d
|
Cleans up goldcore defines
|
2017-11-26 16:51:44 -06:00 |
|
deathride58
|
14ce7c8118
|
Merge pull request #4101 from Citadel-Station-13/upstream-merge-32994
[MIRROR] Updates some item drops to use drop_location()
|
2017-11-25 05:53:16 +00:00 |
|
ShizCalev
|
2762e3b530
|
Fixes Lord Singuloth hungering for more than he should
|
2017-11-24 13:00:42 -06:00 |
|
ShizCalev
|
12aa356f10
|
Updates some item drops to use drop_location()
|
2017-11-24 12:59:33 -06:00 |
|
LetterJay
|
eba36e48f9
|
Merge pull request #3984 from Citadel-Station-13/upstream-merge-32188
[MIRROR] JSON feedback
|
2017-11-22 18:42:34 -06:00 |
|
deathride58
|
b6630b41d1
|
merges #3877 proper
|
2017-11-22 17:37:22 -05:00 |
|
oranges
|
cec6c028f5
|
[READY]Refactors uplinks to a component!
|
2017-11-22 15:17:03 -06:00 |
|
KorPhaeron
|
ddddac262e
|
Fixes blobbernaut spawning (#32954)
* Fixes blobbernaut spawning
* There is no mob yet, we can't poll for it
|
2017-11-21 22:27:49 -06:00 |
|
deathride58
|
0feca054da
|
cleans up whitespace in traitor_bro.dm
|
2017-11-21 14:58:43 -05:00 |
|
deathride58
|
973be1b494
|
Update traitor_bro.dm
|
2017-11-21 14:56:41 -05:00 |
|
deathride58
|
1f6b3ce629
|
Merge branch 'master' into upstream-merge-32188
|
2017-11-21 19:53:58 +00:00 |
|
deathride58
|
2e210d08e1
|
Merge pull request #3639 from deathride58/IHAVENOIDEAWHATTHEFUCKIMDOING
[READY] Redtext bug fix + Endround objective check cleanup
|
2017-11-21 05:53:00 +00:00 |
|
deathride58
|
d2b251d23c
|
Merge pull request #4041 from Citadel-Station-13/upstream-merge-32844
[MIRROR] Cleans up unused code
|
2017-11-21 04:15:11 +00:00 |
|
AnturK
|
70c7996986
|
Fixes abductor teams getting assigned to same pod (#32859)
* Fixes abductors getting assigned to same team
* Remove explicit null return
|
2017-11-20 19:36:10 -06:00 |
|
Jordan Brown
|
2498e1ddc0
|
Cleans up unused code
|
2017-11-20 10:14:32 -06:00 |
|
deathride58
|
c2864b3b8b
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into IHAVENOIDEAWHATTHEFUCKIMDOING
|
2017-11-20 00:21:38 -05:00 |
|
KorPhaeron
|
47b9cc2051
|
Fixes suicidal blobbernauts (#32851)
* Fixes suicidal blobbernauts
* Removes notransform
|
2017-11-18 18:37:50 -06:00 |
|
deathride58
|
eeba86e27e
|
Merge branch 'master' into upstream-merge-32188
|
2017-11-18 05:31:42 +00:00 |
|
deathride58
|
eea00b4d85
|
Update wizard.dm
|
2017-11-17 23:29:09 -05:00 |
|
deathride58
|
a0d70d8823
|
Update traitor.dm
|
2017-11-17 23:28:09 -05:00 |
|
deathride58
|
7b244b40fb
|
Update changeling.dm
|
2017-11-17 23:25:20 -05:00 |
|
Jordie
|
b7e99a7448
|
JSON feedback
|
2017-11-17 01:44:12 -06:00 |
|
vuonojenmustaturska
|
6ce69fb2c8
|
Replaces a bunch of mob loops with hopefully better ones
|
2017-11-16 16:09:15 -06:00 |
|
LetterJay
|
286442cf4a
|
Merge pull request #3833 from Citadel-Station-13/upstream-merge-32183
[MIRROR] Ling datum antag standarization.
|
2017-11-15 15:00:46 -06:00 |
|
LetterJay
|
a8d73f8ec2
|
Merge pull request #3948 from Citadel-Station-13/upstream-merge-32726
[MIRROR] Removes some attackby crowbar checks on nuclear bombs and camera assemblies
|
2017-11-15 10:51:04 -06:00 |
|
LetterJay
|
163ef812fb
|
Merge pull request #3945 from Citadel-Station-13/upstream-merge-32702
[MIRROR] Minor speedups to movement: First Blood Part 2
|
2017-11-15 10:41:16 -06:00 |
|
LetterJay
|
1939e96bb6
|
Merge branch 'master' into upstream-merge-32183
|
2017-11-15 10:22:40 -06:00 |
|