Lin
|
d287f44d9a
|
Merge pull request #13045 from silicons/coggers
ports bronze (fake clockwork) airlocks and windows
|
2020-08-16 20:20:03 -05:00 |
|
Navier
|
fc70d3dde2
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into DRAKEBORG
|
2020-08-15 23:13:41 -04:00 |
|
DeltaFire
|
e611023114
|
FUCK
|
2020-08-16 02:53:29 +02:00 |
|
silicons
|
90234ca065
|
Merge pull request #13155 from Sishen1542/we-in-the-hood
gives wintercoat hoods rad_no_contaminate flags
|
2020-08-14 18:19:45 -07:00 |
|
Lin
|
2fa0b4ae6c
|
Merge pull request #13105 from silicons/underwear_412
ports binder bras from rp
|
2020-08-14 13:03:25 -05:00 |
|
Lin
|
cd89785bc9
|
Merge pull request #13131 from Citadel-Station-13/silicons-patch-6
gives ethereals underwear
|
2020-08-14 13:02:18 -05:00 |
|
Lin
|
b8ba29e6f8
|
Merge pull request #13117 from Citadel-Station-13/silicons-patch-3
fixes nanite hubs
|
2020-08-14 13:01:15 -05:00 |
|
Lin
|
ba9a808aaa
|
Merge pull request #13118 from Citadel-Station-13/silicons-patch-4
fixes nanite programmers not ejecting disks
|
2020-08-14 13:01:08 -05:00 |
|
Lin
|
266109ef45
|
Merge pull request #13119 from Citadel-Station-13/silicons-patch-5
fixes nanite cloud controllers not dropping disks
|
2020-08-14 13:00:44 -05:00 |
|
Sishen
|
bb94bf25fb
|
e
|
2020-08-13 21:39:00 -06:00 |
|
Lin
|
0c9facf6b5
|
Merge pull request #13151 from Citadel-Station-13/silicons-patch-11
why did we comment out abductor batons from being buyable
|
2020-08-13 18:51:39 -05:00 |
|
silicons
|
a51518f2c6
|
Update console.dm
|
2020-08-13 15:41:04 -07:00 |
|
silicons
|
6d93f15ad3
|
Update orderable_gear.dm
|
2020-08-13 15:40:13 -07:00 |
|
silicons
|
b931b450ac
|
Update nanite_cloud_controller.dm
|
2020-08-12 17:18:56 -07:00 |
|
silicons
|
bb29d85983
|
Update nanite_programmer.dm
|
2020-08-12 17:18:40 -07:00 |
|
silicons
|
cd95685eaa
|
Update nanite_program_hub.dm
|
2020-08-12 17:18:06 -07:00 |
|
silicons
|
d2773456f0
|
Update mob.dm
|
2020-08-12 08:33:06 -07:00 |
|
silicons
|
569cef0e42
|
Update ethereal.dm
|
2020-08-11 17:05:32 -07:00 |
|
silicons
|
130c3a9480
|
Merge pull request #13096 from Michiyamenotehifunana/possum
Ports Opossums from Desert Rose
|
2020-08-11 16:19:42 -07:00 |
|
Lin
|
ddb3db5796
|
Merge pull request #13114 from Citadel-Station-13/silicons-patch-1
"it'll be fine Sables, nothing bad will happen if we remove the /mob blacklist from radiation"
|
2020-08-11 18:10:01 -05:00 |
|
silicons
|
775fa046eb
|
you can now use any typepath as an emoji :/obj/item/clothing/mask/joy: (#12808)
* Update emoji_parse.dm
* Update emoji_parse.dm
|
2020-08-11 14:17:35 +02:00 |
|
silicons
|
a8d61b60ef
|
Merge pull request #13011 from timothyteakettle/insane-shot-eyepatch
adds a cybernetic eyepatch to the syndicate uplink
|
2020-08-11 01:47:32 -07:00 |
|
silicons
|
cf209939ea
|
Merge pull request #13070 from kappa-sama/patch-40
lowers price of 2 borderline useless uplink items
|
2020-08-11 01:44:40 -07:00 |
|
silicons
|
b16f920479
|
Merge pull request #13086 from ArchieBeepBoop/dev
Add Skulldog Snout
|
2020-08-11 01:44:29 -07:00 |
|
silicons
|
e7d7b991d9
|
Merge pull request #13107 from DeltaFire15/warcrime-gun-armory-lock
The warcrime gun belongs in the armory
|
2020-08-11 01:44:07 -07:00 |
|
silicons
|
2d01c4db5b
|
Merge pull request #13106 from zeroisthebiggay/cesuitgoclick
ce hardsuit no longer requires a jumpsuit to actually be fully radproof
|
2020-08-11 01:43:54 -07:00 |
|
silicons
|
16a556b367
|
Merge pull request #13101 from Detective-Google/funny
spelling
|
2020-08-11 01:43:35 -07:00 |
|
silicons
|
df05c5ee4d
|
Merge pull request #13089 from Putnam3145/fix-sprite-display
Demodularization + making certain sprite overlays less hilariously jank
|
2020-08-11 01:43:21 -07:00 |
|
silicons
|
c1d8d1d439
|
Merge pull request #13090 from lolzalolka/lean
Added Burek to Space
|
2020-08-11 01:42:58 -07:00 |
|
silicons
|
5694923d89
|
Merge pull request #13095 from lolman360/liver
custom name/desc ring and necklace
|
2020-08-11 01:41:48 -07:00 |
|
silicons
|
035422ed7f
|
Merge pull request #13098 from LetterN/ToS-component
Mafia Component
|
2020-08-11 01:41:13 -07:00 |
|
silicons
|
7bcbcda37b
|
Update nanite_cloud_controller.dm
|
2020-08-11 00:37:44 -07:00 |
|
silicons
|
471d036881
|
Update nanite_programmer.dm
|
2020-08-11 00:35:53 -07:00 |
|
silicons
|
e99414c3d4
|
Update nanite_program_hub.dm
|
2020-08-11 00:34:17 -07:00 |
|
silicons
|
c45ad3af6e
|
Update revenant.dm
|
2020-08-10 21:14:20 -07:00 |
|
Letter N
|
7008dac8dd
|
what if the maps aren't causing runtims
|
2020-08-11 11:49:25 +08: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 |
|
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 |
|