Commit Graph

37275 Commits

Author SHA1 Message Date
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
MrJWhit
60446316bb Update _flags.dm 2020-08-14 21:14:21 -04:00
Detective-Google
13f6df3991 nerfs plasma cutters 2020-08-14 19:38:14 -05:00
Changelogs
66400729c8 Automatic changelog compile [ci skip] 2020-08-15 00:12:03 +00:00
Detective-Google
76bfd9b3a6 ? 2020-08-14 16:09:49 -05:00
Detective Google
81f7307575 yeah 2020-08-14 15:38:27 -05:00
Detective Google
83e1b4f0df woo yeah yeah woo 2020-08-14 15:07:22 -05:00
Lin
2fa0b4ae6c Merge pull request #13105 from silicons/underwear_412
ports binder bras from rp
2020-08-14 13:03:25 -05:00
CitadelStationBot
0a2faa18ae Automatic changelog generation for PR #13131 [ci skip] 2020-08-14 13:02:22 -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
CitadelStationBot
0d930401a1 Automatic changelog generation for PR #13133 [ci skip] 2020-08-14 13:00:15 -05:00
Lin
e1774fb56f Merge pull request #13133 from Citadel-Station-13/silicons-patch-7
clockwork chairs now keep spinning because it's no longer that laggy to maintain it since it's a processing system instead of while(TRUE) now
2020-08-14 13:00:12 -05:00
CitadelStationBot
762c696ab2 Automatic changelog generation for PR #13145 [ci skip] 2020-08-14 12:58:34 -05:00
Lin
d770e29114 Merge pull request #13145 from LetterN/patch-1
makes sleepers use the proper state
2020-08-14 12:58:31 -05:00
Lin
07a4789278 Merge pull request #13112 from silicons/cog
what the fuck is an energy gun
2020-08-14 12:57:48 -05:00
CitadelStationBot
5e64e5da3f Automatic changelog generation for PR #13160 [ci skip] 2020-08-14 08:51:31 -05:00
silicons
e1db0031a6 Merge pull request #13160 from LetterN/fixes-missing-anom
Fixes missing icons for anomaly cores
2020-08-14 06:51:28 -07:00
Letter N
66c0f22d33 fixes missing icons 2020-08-14 21:21:43 +08:00
kiwedespars
aa46e355da more more more.
- sacrifices give 2 charges now.
- books no longer contain a charge by default. (sorry gamerko, no easy ascensions while i sleep.)
- books are easier to craft.
2020-08-14 05:19:57 -07:00
kiwedespars
5fe68dc81d Update dildos.dm 2020-08-14 02:16:43 -07:00
kiwedespars
61486f1287 adds custom parry data. 2020-08-14 01:59:46 -07:00
kiwedespars
53be29d9c2 Update dualsaber.dm 2020-08-14 01:43:47 -07:00
Artur
4f4b243947 Thats that 2020-08-14 11:12:14 +03:00
zeroisthebiggay
af27cc651a Update sillytips.txt
mekhi has been moved
2020-08-14 01:39:25 -04:00
zeroisthebiggay
3840a4ea55 Update tips.txt
mekhi is getting oved
2020-08-14 01:38:10 -04:00
zeroisthebiggay
ea5ac4a742 Update tips.txt
no gamer word sorry
2020-08-14 01:27:06 -04:00
zeroisthebiggay
19599b8745 Update tips.txt
holy shit im retarded
2020-08-14 01:23:27 -04:00
zerothebigboy
ff73a5f3c0 a 2020-08-14 01:15:06 -04:00
zerothebigboy
3fdafcc8db a 2020-08-14 01:11:53 -04:00
zerothebigboy
a4e410256d a 2020-08-14 01:09:36 -04:00
zerothebigboy
e65b17dd01 a 2020-08-14 01:07:52 -04:00
zerothebigboy
4e79a553ff a 2020-08-13 23:57:11 -04:00
zerothebigboy
a3deabf4af a 2020-08-13 23:48:46 -04:00
Sishen
bb94bf25fb e 2020-08-13 21:39:00 -06:00
zerothebigboy
0e2f561c92 a 2020-08-13 23:35:03 -04:00
zerothebigboy
a301c2238b a 2020-08-13 23:24:37 -04:00
deathride58
9fa56199a2 Makes policy regarding species stuff match up with how it's currently enforced 2020-08-13 22:27:17 -04:00
timothyteakettle
8b4fb136b2 ok fuck it 2020-08-14 02:37:08 +01:00
timothyteakettle
a9caceb001 insect fluff! 2020-08-14 02:27:54 +01:00
Hatterhat
d572e7c05e turns out there were sealed vehicles 2020-08-13 19:58:45 -05:00
Changelogs
90013089f0 Automatic changelog compile [ci skip] 2020-08-14 00:29:13 +00:00
deathride58
9410bc517b Updates the contributor policy to reflect the new policy in place 2020-08-13 20:23:27 -04:00
Changelogs
9828f67243 Automatic changelog compile [ci skip] 2020-08-14 00:11:33 +00: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
Lin
9807909804 Merge pull request #13150 from Citadel-Station-13/silicons-patch-10
150 runtimes from warden shotguns being shitcode
2020-08-13 18:51:15 -05:00
CitadelStationBot
a7820b9959 Automatic changelog generation for PR #13152 [ci skip] 2020-08-13 18:50:57 -05:00
Lin
11f0387152 Merge pull request #13152 from Citadel-Station-13/silicons-patch-12
we also left out the code that let abductors actually BUY THINGS
2020-08-13 18:50:53 -05:00