cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-20 14:52:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,497 Commits 55 Branches 0 Tags
901b54b7e8d79d59eb51b9387d2bf4d4aaa1628c
Commit Graph

19666 Commits

Author SHA1 Message Date
KeRSe
9c18d4fdad makes stimulants no longer purchasable by gangs 2020-01-28 15:53:29 -05:00
Ghom
fa5a69523b Merge pull request #10414 from CameronWoof/lights-booooooooooooooi 
The Great Citadel De-Pissening of 2020
 2020-01-28 18:12:30 +01:00
Ghom
fbe79edc24 Merge pull request #10752 from Owai-Seek/cargocratetglass 
6 More Crates
 2020-01-28 18:08:58 +01:00
kevinz000
a1a2d45be6 Update closets.dm 2020-01-28 02:41:04 -07:00
kevinz000
4c2b0a826a WEW LAD 2020-01-27 23:26:24 -07:00
Seris02
feca294f48 tada 2020-01-28 13:56:37 +08:00
kevinz000
d89b8d95cf BRAINLETMOMENT 2020-01-27 22:44:51 -07:00
kevinz000
3ce1fe2585 changes 2020-01-27 22:26:43 -07:00
kevinz000
9d047f07f8 separate this a bit 2020-01-27 21:08:47 -07:00
kevinz000
57b977c2e5 why 2020-01-27 20:41:45 -07:00
kevinz000
7d53d6e162 s 2020-01-27 20:24:02 -07:00
Putnam
cfd65d812a Makes gender change potion not work on people with pref 2020-01-27 19:13:50 -08:00
Putnam
8df9a051ec it compiles now, ready for testmerge probs 2020-01-27 19:09:04 -08:00
Ghom
2bf27e84e6 Merge pull request #10709 from Seris02/mammaltoxin 
Adds mammal mutation toxin to green slime extract recipes
 2020-01-28 04:06:01 +01:00
Putnam3145
209b681db1 Merge pull request #10706 from Ghommie/Ghommie-cit530 
...? ...? (masked human mob examine pet peeve)
 2020-01-27 19:02:13 -08:00
Ghom
362f0e57a4 Giving a hand. 2020-01-28 03:24:39 +01:00
Winter Flare
5883124e0d Removals. 
Removed:
CBT Interrogation
Pastry Crate
Candlelit Dinner Crate
Pest Control Crate
 2020-01-27 20:47:28 -05:00
Ghommie
5875f2578c demodularize and removes lot of unused clothing with missing sprites. 2020-01-28 02:32:46 +01:00
Winter Flare
24388f4fc1 Reverts Path changes. 2020-01-27 20:30:06 -05:00
Ghom
f1197c8618 Merge pull request #10743 from necromanceranne/SHAZBOT 
Spinfusors are no longer purchasable from cargo
 2020-01-28 02:18:32 +01:00
kevinz000
7ae43a2249 fix 2020-01-27 17:51:59 -07:00
kevinz000
c665d971c0 Update misc.dm 2020-01-27 17:45:35 -07:00
kevinz000
91e8bec81a woops 2020-01-27 17:45:13 -07:00
kevinz000
5110a08817 Merge pull request #10737 from Ghommie/Ghommie-cit531 
Refactoring APTFT altclick/verb options into flags
 2020-01-27 17:44:20 -07:00
kevinz000
3055c2b4c1 Merge pull request #10742 from Ghommie/Ghommie-cit532 
Fixes det revolver being risky to use.
 2020-01-27 17:43:46 -07:00
kevinz000
28697a375f Update item_attack.dm 2020-01-27 17:43:21 -07:00
kevinz000
0eb13d8f23 refactors guns a bit 2020-01-27 17:39:49 -07:00
Winter Flare
6e7d079928 Changed Dirty Mags and Candle 2020-01-27 19:34:33 -05:00
kevinz000
e50eb495df pre attack refactor 2020-01-27 16:30:23 -07:00
kevinz000
402abd9287 Merge branch 'god_wish_your_plushies_holy_shit' of github.com-kevinz000:kevinz000/Citadel-Station-13 into god_wish_your_plushies_holy_shit 2020-01-27 15:48:14 -07:00
kevinz000
54f9df9f88 ;GUYS WHERE'S PORT I KEEP FORGETTING MY DIRECTIONS 2020-01-27 13:19:53 -07:00
Ghom
0ed72c7722 Merge pull request #10692 from Citadel-Station-13/TESTING 
faster get_hearers_in_view/getallcontents i guess
 2020-01-27 21:06:52 +01:00
CygnusB
675e6cb9a6 Reunites Shaggy (hair from virgo) with Scooby Terrowin 
self-insert baby pr florida man tries to merge his hair back into citadel
 2020-01-27 15:51:38 -03:00
Ghom
5dc92f3968 Merge pull request #10733 from Hatterhat/fine-i'll-do-it-myself 
the zombie powder nerf - tgstation#46931
 2020-01-27 17:34:58 +01:00
Winter Flare
5bc590ad52 Merge branch 'master' into cargocratetglass 2020-01-27 08:03:30 -05:00
Winter Flare
21fe8be5dc Mmmmm, more crates. 
Fixed: Engineering Hardsuit Crate

Removed:
Duplicate Exotic Seed Crate
Festive Wrapping Paper Crate (Replaced)

Tweak:
Grouped some stuff in each tab. (Medical Kits, Space Suits, Ingredients, Meals)
Added Ambrosia Seed to Seed Crate
Added 2 Spray Cans to Biker Gang Crate

Moved:
Grill to Service
All Vending Supplies to a new tab.

Added:
Candle Crate
Dirty Magazine Crate (Emag)
CBT Interrogation Crate (Contraband)
Cargo Packaging Crate
Pest Control Crate (Contraband)
Candlelit Dinner Crate
Portable Air Pump Crate
Portable Scrubber Crate
Pastry Crate
Burger Combo Crate

Known Issues:
I don't know how to get randomised crates to show up in the proper order.
 2020-01-27 07:00:40 -05:00
kevinz000
68227dcdb1 Update misc.dm 2020-01-27 03:53:50 -07:00
kevinz000
fa2cc0cfdf adds 2020-01-27 03:39:27 -07:00
kevinz000
74fb726b8d Update traitor_bro.dm 2020-01-27 03:27:09 -07:00
kevinz000
1e19ec2c50 bad var 2020-01-27 02:59:27 -07:00
kevinz000
4883b36576 compile 2020-01-27 02:55:32 -07:00
kevinz000
d4d315b447 :^) 2020-01-27 02:51:01 -07:00
kevinz000
d5d0a7d7ba Update capture_the_flag.dm 2020-01-26 22:16:18 -07:00
kevinz000
2c1b63cdb9 Update capture_the_flag.dm 2020-01-26 22:07:49 -07:00
kevinz000
d17472b8f2 Update species.dm 2020-01-26 22:00:19 -07:00
kevinz000
f9ee9bdadf Update capture_the_flag.dm 2020-01-26 21:54:23 -07:00
Ghom
1eb3c09bf8 Merge pull request #10703 from Hatterhat/drake-suit-buff-question-mark 
drake armor goliath resistance
 2020-01-27 05:45:03 +01:00
Ghom
6567f9dd0d Merge pull request #10711 from Citadel-Station-13/kevinz000-patch-8 
buffs door crushing
 2020-01-27 05:38:59 +01:00
Ghom
9ee208dd4f Merge pull request #10722 from Putnam3145/fix-relief 
Relief valve fixes
 2020-01-27 05:37:53 +01:00
Ghom
7b49d4842a Fire alarms. 2020-01-27 05:05:08 +01:00