shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
34,686 Commits 5 Branches 0 Tags
a34a7ba5d4e2dc8bb20201b5cb8e4bea2f4abc51
Commit Graph

15002 Commits

Author SHA1 Message Date
Ghommie
a34a7ba5d4 You can't (un)equip garments on/from obscured inventory slots anymore. 2020-06-28 01:10:22 +02:00
Linzolle
15be6217bd Merge branch 'master' of github.com:Citadel-Station-13/Citadel-Station-13 into chemmaster 2020-06-23 20:49:12 -05:00
Ghom
db7c3b1ee3 Merge pull request #12574 from DeltaFire15/random-item-whoopsie 
Buying a 'random uplink item' can no longer force objective / class changes
 2020-06-24 00:28:00 +02:00
Ghom
b69a31fef1 Merge pull request #12565 from timothyteakettle/some-small-fixes 
two small fixes
 2020-06-23 03:36:16 +02:00
Ghom
1ade833952 Merge pull request #12572 from DeltaFire15/no-free-nullcrates 
Disables the stray syndicate crate event
 2020-06-23 03:27:12 +02:00
Lin
a0a4007332 Merge pull request #12567 from Citadel-Station-13/kevinz000-patch-5 
Slime color changing now has 65536 possible colors instead of 256
 2020-06-21 19:37:54 -05:00
Lin
2cd18f3dba Merge pull request #12557 from silicons/life 
Splits Life() into procs for physical and biological life processes in preparation for stasis beds
 2020-06-21 18:32:58 -05:00
silicons
99a7c49e52 Merge pull request #12561 from shellspeed1/Ports-kyro-chems 
Ports IV bags from TG
 2020-06-21 14:11:10 -07:00
silicons
8cd81ff89b Merge pull request #12488 from Ghommie/Ghommie-cit813 
Porting Cargo small-order support, cargo goodies packs, beating vendors for loot/squish.
 2020-06-21 14:10:45 -07:00
silicons
753fcbb84a Merge pull request #12556 from Detective-Google/bald-bald-bald-bald-bald-bald-bald 
Ports the reworked snowcabin and beach away missions
 2020-06-21 14:10:29 -07:00
Timothy Teakettle
983aac10a2 fixes it properly 2020-06-21 17:39:36 +01:00
DeltaFire
82d21e4824 smol fix 2020-06-21 03:44:12 +02:00
shellspeed1
06f0d42ee9 makes chem packs slightly cheaper 2020-06-20 16:53:39 -07:00
Lin
905d4ee74d Merge pull request #12558 from Citadel-Station-13/kevinz000-patch-4 
Drastically buffs punch hit chance
 2020-06-20 18:44:17 -05:00
DeltaFire
6cababd09b yeeah no more free random nullcrates 2020-06-21 01:30:39 +02:00
Detective Google
4e26916502 Merge remote-tracking branch 'upstream/master' into bald-bald-bald-bald-bald-bald-bald 2020-06-20 14:00:14 -05:00
Linzolle
b873f244c9 finally 2020-06-19 22:46:31 -05:00
kevinz000
354cc7d0c7 Update jellypeople.dm 2020-06-19 19:31:38 -07:00
Ghommie
48c13fcc10 Removing now unused old embed behavior 2020-06-20 00:15:52 +02:00
Ghommie
29a8d2ed78 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit813 2020-06-20 00:07:47 +02:00
kevinz000
6516e07bd8 Merge pull request #12566 from Ghommie/Ghommie-cit818 
Fixing some runtimes issues and warnings bout rnd.
 2020-06-19 14:22:40 -07:00
Ghom
e31ce2edcf Merge pull request #12414 from LetterN/asset-cache-thing 
asset cache + better minimaps
 2020-06-19 23:09:09 +02:00
Ghom
dd009ada48 Merge pull request #12542 from bunny232/scrubber 
Removes lewd events from the vent clog event
 2020-06-19 23:07:23 +02:00
Ghommie
43acf79dd3 oh wow 2020-06-19 21:55:01 +02:00
Ghommie
162549a3c2 Fixing stuff. 2020-06-19 20:34:51 +02:00
Timothy Teakettle
7fa5107b4b all methods of cooking define quality 2020-06-19 17:16:34 +01:00
Timothy Teakettle
a8f4988c36 alter form updates hair 2020-06-19 17:09:54 +01:00
Lin
3cdc73ff35 Merge pull request #12487 from kevinz000/erp_2 
Adds ||italics|| __underline__ ++bold++ support because why the fuck not
 2020-06-18 13:37:10 -05:00
Lin
7d30d7c7ff Merge pull request #12545 from Citadel-Station-13/kevinz000-patch-1 
maybe fixes conveyors being a crash vector
 2020-06-18 13:34:31 -05:00
nik707
1f53cd34d3 Merge pull request #12563 from kevinz000/shuttles 
fixes master (shuttles not loading)
 2020-06-18 10:41:20 -05:00
kevinz000
8a90590263 Update species.dm 2020-06-18 08:25:49 -07:00
kevinz000
1b5ea90c8f sigh 2020-06-18 08:16:05 -07:00
shellspeed1
b490f02c78 Ports IV bags from TG 
Ports the iv bag portion of https://github.com/tgstation/tgstation/pull/44531/files from tg.
 2020-06-18 02:30:58 -07:00
SmArtKar
17c38efbb0 Runtime Fixes 2020-06-18 11:24:08 +03:00
kevinz000
291004d0fb Update species.dm 2020-06-17 22:44:08 -07:00
kevinz000
78fadafa05 alright 2020-06-17 21:44:49 -07:00
kevinz000
409dbd2835 carbons and humans 2020-06-17 21:42:04 -07:00
kevinz000
1336404eb6 last ones 2020-06-17 21:37:19 -07:00
kevinz000
445d94f335 haha whew 2020-06-17 21:32:10 -07:00
kevinz000
118ac1a775 Merge pull request #12548 from timothyteakettle/more-events 
ports several tg events including fugitives
 2020-06-17 20:10:04 -07:00
kevinz000
c42889feb6 Merge pull request #12555 from Funce/sqrt-circuit-fix 
Square Root Circuit fix
 2020-06-17 20:08:11 -07:00
Lin
46fdb476b5 Merge pull request #12482 from TheSpaghetti/patch-1 
More insectoid insects (I accidentally ruined the first version of this, so I'm trying again.)
 2020-06-17 20:03:25 -05:00
Detective Google
0e1db216c8 Ports the reworked snowcabin and beach away missions by Jerry Derpinson (the baldy) 2020-06-17 19:33:14 -05:00
Funce
aa798af36e Fix square root circuit to check the only input it has 2020-06-18 08:50:29 +12:00
Timothy Teakettle
2229db2214 Merge branch 'master' into embed-changes 2020-06-17 16:40:34 +01:00
kevinz000
eb572c9d47 Merge pull request #12537 from timothyteakettle/ports-tipping-medibots 
ports tipping medbots from tg
 2020-06-17 08:35:50 -07:00
kevinz000
2e943e03a3 Merge pull request #12544 from SmArtKar/bee_shuttles 
Shuttles from beestation
 2020-06-17 08:35:34 -07:00
kevinz000
ba162eb90a Merge pull request #12530 from Detective-Google/no-more-100%-chance-combat-upgrade 
Ashwalker den no longer spawns with a Malf upgrade and illegal tech
 2020-06-16 23:32:48 -07:00
SmArtKar
170a38a3a7 Porting sutures and meshes from /TG/ (#12532) 
* Porting sutures and meshes from /TG/

* Recipes fix
 2020-06-16 16:22:56 -07:00
Timothy Teakettle
d1432e20b0 woops make it back to 10 minutes 2020-06-16 23:54:44 +01:00