Commit Graph

26895 Commits

Author SHA1 Message Date
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&copypaste 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 04a0c2be6c Merge pull request #13194 from DeltaFire15/slab-wiki
Updates the clockcult help link to link to our wiki.
2020-08-18 18:53:21 -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
timothyteakettle 46a464d3b8 no it also cant be sentient 2020-08-19 02:26:08 +01:00
timothyteakettle 097851cbc4 better name 2020-08-19 02:11:08 +01:00
timothyteakettle 98baa09005 the aforementioned pet changes 2020-08-19 01:47:11 +01:00
Timothy Teakettle 19dce2263d that too 2020-08-18 17:49:01 +01:00
Timothy Teakettle 945ac02152 small error 2020-08-18 17:48:10 +01: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 e00c383b1a Update belt.dm 2020-08-18 20:19:54 +10:00
lolman360 7390effcb9 e 2020-08-18 19:09:01 +10:00
lolman360 36bcc3a869 Merge branch 'plumb' of https://github.com/lolman360/Citadel-Station-13 into plumb 2020-08-18 18:57:35 +10:00
lolman360 b466a5aae9 e 2020-08-18 18:57:23 +10:00
lolman360 4e23559065 Update sheet_types.dm 2020-08-18 18:15:24 +10: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
kiwedespars bd239b01b3 Update recipes_clothing.dm 2020-08-17 23:52:41 -07: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 3040032409 documentation updates 2020-08-18 15:42:19 +10:00
lolman360 8085ab01d9 culst! 2020-08-18 15:38:59 +10:00
lolman360 8f5078a15a Update mineral.dm 2020-08-18 14:47:47 +10:00