Ghommie
|
fde859bca0
|
Removing priority overlays, update_icon() splitup for guns.
|
2020-08-20 18:33:23 +02:00 |
|
Timothy Teakettle
|
bc16a8f1b2
|
fix lizard snouts
|
2020-08-20 16:39:07 +01:00 |
|
Hatterhat
|
02194633b5
|
initial commit - za hando
|
2020-08-20 09:14:30 -05:00 |
|
Ludox
|
d51af28f77
|
Bumps min-pop to 25
Ahahah 3 years that we can have 10 pop xenos :)
|
2020-08-20 14:39:04 +02:00 |
|
Letter N
|
8d70e21239
|
the unexpected paperwork update. paperwork rp? And also includes ntnet upgrade because fuck it.
|
2020-08-20 19:40:47 +08:00 |
|
Letter N
|
2dd3d71b19
|
config©paste chang.
|
2020-08-20 16:36:24 +08:00 |
|
Letter N
|
3b7bca28b3
|
Functional* code
|
2020-08-20 13:50:33 +08:00 |
|
silicons
|
11467e1cae
|
Merge pull request #13212 from Putnam3145/reftrack
Ports reftracking from TG.
|
2020-08-19 22:03:16 -07:00 |
|
silicons
|
91484356c5
|
Merge pull request #13183 from SmArtKar/shuttle_hotfix
Shuttle hotfix so now you can make huge shuttle things
|
2020-08-19 21:03:58 -07:00 |
|
silicons
|
0e2e4fdaf7
|
Merge pull request #13199 from lolman360/haha
[READY] tested code
|
2020-08-19 21:03:21 -07:00 |
|
silicons
|
8a1cf1b860
|
Merge pull request #13208 from timothyteakettle/fuck
fixes two snout paths
|
2020-08-19 19:56:12 -07:00 |
|
silicons
|
5414a8949c
|
Update text.dm
|
2020-08-19 08:50:26 -07:00 |
|
DeltaFire
|
7a9796e782
|
minmax torture
|
2020-08-19 17:05:27 +02:00 |
|
silicons
|
747c2af995
|
Merge pull request #13210 from Hatterhat/pirate-bruh-moment
>pirate announce metabreaks >in the year of our Lord 2020
|
2020-08-19 06:59:36 -07:00 |
|
lolman360
|
4259332cfd
|
e
|
2020-08-19 18:37:31 +10:00 |
|
lolman360
|
1654a925b6
|
Update smoke_machine.dm
|
2020-08-19 18:26:53 +10:00 |
|
lolman360
|
e82772dc44
|
kekw
|
2020-08-19 17:22:52 +10:00 |
|
Putnam
|
81dc6c7ee5
|
Ports reftracking from TG.
|
2020-08-18 20:41:43 -07:00 |
|
Hatterhat
|
0c4a3c740d
|
>metabreaks >2020
|
2020-08-18 21:50:57 -05:00 |
|
Putnam3145
|
cc99a89027
|
Merge pull request #13206 from Citadel-Station-13/silicons-patch-18
[s] xss
|
2020-08-18 19:24:14 -07:00 |
|
lolman360
|
ee4da21d38
|
Merge branch 'haha' of https://github.com/lolman360/Citadel-Station-13 into haha
|
2020-08-19 12:20:38 +10:00 |
|
lolman360
|
f35989b09e
|
Merge remote-tracking branch 'upstream/master' into haha
|
2020-08-19 12:20:07 +10:00 |
|
timothyteakettle
|
b40a42209d
|
fixes two snout paths
|
2020-08-19 03:19:51 +01:00 |
|
Letter N
|
fa7b82694d
|
src.islazy = TRUE
|
2020-08-19 10:04:56 +08:00 |
|
lolman360
|
5306da7938
|
Update code/modules/projectiles/guns/ballistic.dm
Co-authored-by: silicons <2003111+silicons@users.noreply.github.com>
|
2020-08-19 12:02:53 +10:00 |
|
lolman360
|
09bba25050
|
Update code/modules/projectiles/boxes_magazines/_box_magazine.dm
Co-authored-by: silicons <2003111+silicons@users.noreply.github.com>
|
2020-08-19 12:02:45 +10:00 |
|
lolman360
|
a7a964154e
|
Update code/modules/projectiles/boxes_magazines/_box_magazine.dm
Co-authored-by: silicons <2003111+silicons@users.noreply.github.com>
|
2020-08-19 12:02:34 +10:00 |
|
Letter N
|
b59d449a75
|
Update adminhelp.dm
|
2020-08-19 09:59:41 +08:00 |
|
silicons
|
48652e4b0a
|
Merge pull request #13202 from tiramisuapimancer/master
Makes Ethereal hair their mutcolor instead of white
|
2020-08-18 18:53:40 -07:00 |
|
silicons
|
0331f0cdc3
|
Merge pull request #13189 from timothyteakettle/revert-13187-revert-13110-cum
Revert "[TESTMERGE ONLY] FUCK"
|
2020-08-18 18:52:52 -07:00 |
|
silicons
|
ce80f64d27
|
Update suppression.dm
|
2020-08-18 18:52:06 -07:00 |
|
Timothy Teakettle
|
264e789c3d
|
yes
|
2020-08-18 17:38:20 +01:00 |
|
Timothy Teakettle
|
6392367df4
|
donator items
|
2020-08-18 17:28:09 +01:00 |
|
lolman360
|
9931cb006c
|
eee
|
2020-08-18 17:33:20 +10:00 |
|
tiramisuapimancer
|
13609ba6e6
|
Update ethereal.dm
|
2020-08-17 23:01:01 -08:00 |
|
lolman360
|
d8e286d7be
|
ee
|
2020-08-18 16:17:00 +10:00 |
|
lolman360
|
325f4eb72e
|
Updates 2
|
2020-08-18 15:43:44 +10:00 |
|
lolman360
|
8085ab01d9
|
culst!
|
2020-08-18 15:38:59 +10:00 |
|
lolman360
|
6f21b23a87
|
Fixes Shit.
|
2020-08-18 14:28:57 +10:00 |
|
lolman360
|
f2a86f2c42
|
Update medical_designs.dm
|
2020-08-18 14:23:09 +10:00 |
|
lolman360
|
8027706bea
|
Update _box_magazine.dm
|
2020-08-18 13:45:44 +10:00 |
|
Letter N
|
5dff3e9a04
|
deletes ping
|
2020-08-18 11:35:10 +08:00 |
|
lolman360
|
2d1edc9fa2
|
Update _box_magazine.dm
|
2020-08-18 13:30:49 +10:00 |
|
lolman360
|
8356dbf20a
|
Update medical_designs.dm
|
2020-08-18 13:26:32 +10:00 |
|
silicons
|
50eca19658
|
Revert "load_delay var for /obj/item/ammo_box, nerfs shotgun stripper clips (hatter why'd you pr them)"
|
2020-08-17 20:20:04 -07:00 |
|
Letter N
|
83df9159de
|
GOONCHAT IS DEAD! LONG LIVE THE KING!
|
2020-08-18 10:51:13 +08:00 |
|
Letter N
|
90cb13f6af
|
Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT
|
2020-08-18 10:33:21 +08:00 |
|
lolman360
|
32c0335a17
|
Update medical_designs.dm
|
2020-08-18 10:35:56 +10:00 |
|
timothyteakettle
|
d312a5d639
|
fix tails
|
2020-08-18 01:32:06 +01:00 |
|
lolman360
|
93fa8b72b8
|
w e w
|
2020-08-18 10:05:54 +10:00 |
|