 kiwedespars
|
cac77ec121
|
probably important right now for admin-given heretics to receive equipment.
|
2020-08-10 21:06:15 -07:00 |
|
|
kiwedespars
|
036c7dbe39
|
Merge remote-tracking branch 'upstream/master' into heretics
|
2020-08-10 21:05:56 -07:00 |
|
|
kiwedespars
|
415e2556f9
|
descriptions, conflict, and actually puts requirements for the gamemode.
|
2020-08-10 20:59:51 -07:00 |
|
|
Letter N
|
7008dac8dd
|
what if the maps aren't causing runtims
|
2020-08-11 11:49:25 +08:00 |
|
|
kiwedespars
|
c09960c48f
|
woops fixed sacrificing, husks people instead of gibbing now.
|
2020-08-10 20:00:42 -07:00 |
|
|
timothyteakettle
|
b9efa05ec4
|
double FUCK
|
2020-08-11 03:40:41 +01:00 |
|
|
timothyteakettle
|
84a8585055
|
FUCK
|
2020-08-11 03:38:25 +01:00 |
|
|
timothyteakettle
|
1f240b883f
|
holy shit
|
2020-08-11 03:37:04 +01:00 |
|
|
kiwedespars
|
eb8574d6d6
|
heretics from tg (with changes)
|
2020-08-10 19:17:26 -07:00 |
|
|
Timothy Teakettle
|
24557c415c
|
i said CEASE
|
2020-08-10 21:42:52 +01:00 |
|
|
Timothy Teakettle
|
033fe553e8
|
cease your shitcode
|
2020-08-10 21:41:06 +01:00 |
|
|
Hatterhat
|
8370a31942
|
funny adminspawn wound bullets
|
2020-08-10 12:12:32 -05:00 |
|
|
DeltaFire
|
0f27a89e5d
|
yeah this belongs into the armory
Hellgun single pack
goodies > armory
|
2020-08-10 18:41:56 +02:00 |
|
|
zerothebigboy
|
9baedbd904
|
a
|
2020-08-10 10:08:25 -04:00 |
|
|
zerothebigboy
|
cf75f7d4b6
|
a
|
2020-08-10 10:08:15 -04:00 |
|
|
silicons
|
375f740d8b
|
sigh
|
2020-08-10 04:52:33 -07:00 |
|
|
Letter N
|
afe53992b5
|
miniump of 5, max of 12
|
2020-08-10 17:47:33 +08:00 |
|
|
silicons
|
3795bcf2d0
|
Merge pull request #13097 from zeroisthebiggay/yessalthairpr
Patented Zero Salt PR That Adds One New Hair Style That Is Just Pompadourless Volaju Because
|
2020-08-10 02:29:47 -07:00 |
|
|
Letter N
|
c70f1510e6
|
fairly sure mmo mafia is not a thing and i'm lazy
|
2020-08-10 16:00:38 +08:00 |
|
|
Letter N
|
ec57c24a71
|
endgame
|
2020-08-10 13:10:40 +08:00 |
|
|
Letter N
|
a4040ace26
|
hewwo have you tried to work?
|
2020-08-10 10:50:07 +08:00 |
|
|
Michiyamenotehifunana
|
0f274d5891
|
Fixes some code anomalies
Adds newline to possum code, reverts var invalidation in kilostation's pets
|
2020-08-10 09:40:23 +08:00 |
|
|
lolman360
|
c160d73265
|
ee
|
2020-08-10 10:40:30 +10:00 |
|
|
lolman360
|
900b0b068a
|
linter take 3
love u putnam
|
2020-08-10 10:38:53 +10:00 |
|
|
lolman360
|
d9c198825b
|
linter 2:
|
2020-08-10 10:29:17 +10:00 |
|
|
lolman360
|
6c4c3e4255
|
lint!
|
2020-08-10 09:47:55 +10:00 |
|
|
lolman360
|
a44afad849
|
Update autohydro.dm
|
2020-08-10 08:26:06 +10:00 |
|
|
Detective Google
|
bbe32ab412
|
lmao
|
2020-08-09 16:36:58 -05:00 |
|
|
chrisbbbbbbb
|
e8ac70696f
|
new food idk?
|
2020-08-09 18:58:32 +02:00 |
|
|
ArchieBeepBoop
|
950c8fb8be
|
Merge pull request #2 from ArchieBeepBoop/master
Update Dev Branch
|
2020-08-09 13:23:25 -03:00 |
|
|
silicons
|
4da1d0b73c
|
Update human_defense.dm (#13002)
|
2020-08-09 16:06:53 +02:00 |
|
|
Winter Flare
|
76293ee032
|
My balls are raw. Meatballs, that is. (#13075)
* Food Processor produces Raw Meatball
* No nutrition loss from slabs.
|
2020-08-09 16:01:52 +02:00 |
|
|
silicons
|
07e2423c22
|
regarding malf ais, apcs, space, and engineering cyborg grippers (#12933)
* Update areas.dm
* Update apc.dm
* Update apc.dm
|
2020-08-09 15:57:53 +02:00 |
|
|
lolman360
|
cbe783023d
|
Update autohydro.dm
|
2020-08-09 23:55:06 +10:00 |
|
|
lolman360
|
6c57dce54e
|
WX
|
2020-08-09 23:52:21 +10:00 |
|
|
silicons
|
5abab38613
|
increases space levels to 4 (#13022)
* Update map_config.dm
* Update code/modules/mapping/map_config.dm
Co-authored-by: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
Co-authored-by: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
|
2020-08-09 15:41:58 +02:00 |
|
|
Letter N
|
2f1b769ae4
|
lazyfix
|
2020-08-09 21:38:42 +08:00 |
|
|
Letter N
|
bfba7307ec
|
fix
|
2020-08-09 21:29:08 +08:00 |
|
|
Seris02
|
635a42e102
|
yeet (#11699)
|
2020-08-09 15:14:25 +02:00 |
|
|
Letter N
|
f86fb54aab
|
https://github.com/tgstation/tgstation/tree/master/code/modules/mafia
|
2020-08-09 21:09:52 +08:00 |
|
|
lolman360
|
fee304fb19
|
Update medical_designs.dm
|
2020-08-09 22:55:10 +10:00 |
|
|
silicons
|
a950adc0df
|
Update regalrat.dm (#13076)
|
2020-08-09 14:49:10 +02:00 |
|
|
lolman360
|
308d77da7c
|
Merge branch 'master' into plumb
|
2020-08-09 22:48:18 +10:00 |
|
|
silicons
|
f20f01cc6b
|
Merge pull request #12853 from LetterN/TGUI-4
TGUI4 port
|
2020-08-09 05:46:21 -07:00 |
|
|
silicons
|
8ef539b417
|
Merge pull request #13053 from kappa-sama/patch-39
makes cargo's Dirty Magazines 3x cheaper
|
2020-08-09 05:43:37 -07:00 |
|
|
silicons
|
fb43e9a2d2
|
Merge pull request #13054 from KeRSedChaplain/zombies!
Improves zombies, the gimped threat
|
2020-08-09 05:42:31 -07:00 |
|
|
silicons
|
25d7b15478
|
Merge pull request #13060 from Hatterhat/timestop-katana
wizard timestop parrying katana
|
2020-08-09 05:41:55 -07:00 |
|
|
silicons
|
cd18e3f4d3
|
Merge pull request #13085 from Hatterhat/glaive-parry-cont
KC-G Phase 2.1 - Parry Tweaks
|
2020-08-09 05:41:26 -07:00 |
|
|
silicons
|
d2f5c6688b
|
Merge pull request #13084 from Putnam3145/ic-wording-fix
Made IC issue wording less salt-assuming
|
2020-08-09 05:41:10 -07:00 |
|
|
silicons
|
3068accd2b
|
Merge pull request #13082 from Putnam3145/anaphro
Removed (an)aphrodisiacs.
|
2020-08-09 05:39:56 -07:00 |
|