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-26 09:44:51 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,645 Commits 55 Branches 0 Tags
db6fdc0f48d68ff2314cd40db8a39ea7b51d6bef
Commit Graph

10481 Commits

Author SHA1 Message Date
LetterJay
25b3828100 Merge pull request #6624 from Citadel-Station-13/upstream-merge-37609 
[MIRROR] Satiates Barhandar's thirst for alcoholic apples (Bikeshed Hard Cider Desc Changes)
 2018-05-03 08:54:01 -05:00
Dax Dupont
a8a31c9e4b You can no longer print infinite ammunition. (#37626) 
* You can no longer print infinite ammunition.

* henk

lazy

anus

Reduces .38

Casings now give a tiny bit of metal so the janitor gets a buff

spacing
 2018-05-03 08:45:17 -05:00
Jordan Brown
61263daa0b Merge pull request #37625 from ShizCalev/infrared 
Updates infrared emitters to use the rotate component
 2018-05-03 08:44:01 -05:00
Jordan Brown
deddd8debe Merge pull request #37622 from ShizCalev/cockarock 
Changes cockroach guts to insect guts
 2018-05-03 08:42:46 -05:00
Jordan Brown
19140f2cb2 Merge pull request #37620 from AutomaticFrenzy/patch/dominator 
Remove a leftover reference to the gang dominator
 2018-05-03 08:41:32 -05:00
Jordan Brown
5c758e2f3a Merge pull request #37621 from ShizCalev/brainwash-uplink-loc 
Corrects brainwashing surgery program category
 2018-05-03 08:41:23 -05:00
Armhulen
fa6292dbd5 deadly brain tumor now gives -3 points (#37455) 
* i can tweak it if need be yadda yadda one line change

* ok lets be SENSIBLE.
 2018-05-02 21:24:26 -05:00
Armhulen
04057dc7d6 Plasmamen organs GET sprites! (#37595) 
* DONE

* initial

* Removes random slashes
 2018-05-02 21:21:11 -05:00
pigeons
2702788dac Removes stock market 2018-05-02 17:48:55 -05:00
Grandmother of 50
d09ae95d42 Satiates Barhandar's thirst for alcoholic apples (Bikeshed Hard Cider Desc Changes) (#37609) 
* Update alcohol_reagents.dm

* removes period
 2018-05-02 17:31:22 -05:00
Mickyan
5596472fc1 fixes midori cigs being empty (#37615) 2018-05-02 17:31:14 -05:00
Grandmother of 50
26fa3e1d12 Update machine_designs.dm (#37289) 2018-05-02 16:12:28 -05:00
deathride58
5098e0db21 Merge pull request #6490 from Citadel-Station-13/upstream-merge-37381 
[MIRROR] Fixes toolbelts holding everything
 2018-05-02 14:27:25 +00:00
deathride58
f5cbfd1c52 Merge pull request #6577 from Citadel-Station-13/upstream-merge-36839 
[MIRROR] Deactivate suicide prescans via ghost var
 2018-05-02 14:25:32 +00:00
deathride58
d2804694e0 Merge pull request #6618 from Citadel-Station-13/upstream-merge-37606 
[MIRROR] Corrects mistake in storage implant uplink description
 2018-05-02 14:25:14 +00:00
deathride58
711f309c46 Update suicide.dm 2018-05-02 10:01:47 -04:00
deathride58
55566461c6 Merge pull request #6601 from Citadel-Station-13/upstream-merge-37565 
[MIRROR] Modifies component transfer to make ChangeTurf able to transfer components
 2018-05-02 13:59:14 +00:00
Jordan Brown
0a0875e447 Merge pull request #37606 from ShizCalev/storage-implant-uplink-description 
Corrects mistake in storage implant uplink description
 2018-05-02 08:38:09 -05:00
vuonojenmustaturska
49150c542f Splits APC attackbys into tool acts, removes some old parts that do nothing and allows crowbars to remove the cell too (#37035) 
* APC crap

* moar define

* honk

* cover defines
 2018-05-02 01:32:34 -05:00
deathride58
f35bfa22e4 Merge pull request #6614 from Citadel-Station-13/upstream-merge-37475 
[MIRROR] H.O.G.A.N. lawset
 2018-05-02 01:33:19 +00:00
deathride58
9151a80461 Merge pull request #6613 from Citadel-Station-13/upstream-merge-37590 
[MIRROR] Reorganizes cargo's big "miscellaneous supplies" category
 2018-05-02 01:32:40 +00:00
deathride58
4d44701ee5 Merge pull request #6612 from Citadel-Station-13/upstream-merge-37580 
[MIRROR] Craftable HUDsunglasses
 2018-05-02 01:32:01 +00:00
deathride58
5c40a38457 Merge pull request #6609 from Citadel-Station-13/upstream-merge-37584 
[MIRROR] Readds missing nuked narsie cinematic.
 2018-05-02 01:30:19 +00:00
deathride58
a84f5c5328 Merge pull request #6608 from Citadel-Station-13/upstream-merge-37516 
[MIRROR] Changes the trauma formula so constant small ticks don't keep triggering traumas
 2018-05-02 01:30:00 +00:00
deathride58
f248685db2 Merge pull request #6607 from Citadel-Station-13/upstream-merge-37579 
[MIRROR] Fix placing boxes in storage implants
 2018-05-02 01:29:41 +00:00
deathride58
084f2ac1da Merge pull request #6606 from Citadel-Station-13/upstream-merge-37593 
[MIRROR] Revert "fixes a pacifism kill through crushing firelocks! (#37511)"
 2018-05-02 01:29:15 +00:00
deathride58
a4b48cdc53 Merge pull request #6604 from Citadel-Station-13/upstream-merge-37562 
[MIRROR] Fix runtimes in corpse code due to mob_spawners becoming null
 2018-05-02 01:28:05 +00:00
deathride58
2b8e734488 Merge pull request #6603 from Citadel-Station-13/upstream-merge-37560 
[MIRROR] Fix mecha maintenance protocol button always saying Initiate
 2018-05-02 01:27:51 +00:00
deathride58
f49c9d7e3d Merge pull request #6602 from Citadel-Station-13/upstream-merge-37561 
[MIRROR] Fixes loading custom aways.
 2018-05-02 01:27:26 +00:00
deathride58
613fadf057 Update _concrete.dm 2018-05-01 21:27:01 -04:00
deathride58
fa5db57b56 Merge pull request #6600 from Citadel-Station-13/upstream-merge-37568 
[MIRROR] Removes enriched uranium
 2018-05-02 01:26:27 +00:00
deathride58
2760c61720 Merge pull request #6599 from Citadel-Station-13/upstream-merge-37572 
[MIRROR] Fixes the intergalactic stock market crash by removing the speculation/performance modifier
 2018-05-02 01:26:05 +00:00
deathride58
8f00bca017 Merge pull request #6598 from Citadel-Station-13/upstream-merge-37477 
[MIRROR] Makes dizziness work again
 2018-05-02 01:25:46 +00:00
deathride58
9c1a4303f9 Merge pull request #6597 from Citadel-Station-13/upstream-merge-37510 
[MIRROR] Circuits can't throw themselves
 2018-05-02 01:25:23 +00:00
deathride58
d26ba53e91 Merge pull request #6596 from Citadel-Station-13/upstream-merge-37513 
[MIRROR] Adds traits for a character's preference towards pineapples.
 2018-05-02 01:25:04 +00:00
deathride58
ea5725cc4e Merge pull request #6595 from Citadel-Station-13/upstream-merge-37549 
[MIRROR] Resolved var name conflict for bounce_away()
 2018-05-02 01:24:36 +00:00
deathride58
7d01eeeb35 Merge pull request #6593 from Citadel-Station-13/upstream-merge-37556 
[MIRROR] More holosigns for techwebs
 2018-05-02 01:23:19 +00:00
deathride58
dd5669d752 Update suicide.dm 2018-05-01 21:22:42 -04:00
deathride58
dca50e5d35 Merge pull request #6575 from Citadel-Station-13/upstream-merge-37349 
[MIRROR] Adds fly and moth categories to limb grower
 2018-05-02 01:21:37 +00:00
deathride58
4851b9bd82 Merge pull request #6559 from Citadel-Station-13/upstream-merge-37501 
[MIRROR] Fixes missing icons
 2018-05-02 01:19:58 +00:00
deathride58
97ad0f39a7 Merge pull request #6552 from Citadel-Station-13/upstream-merge-37081 
[MIRROR] adds new changeling var that counts actual absorbs, uses it for Spiders ability
 2018-05-02 01:17:58 +00:00
deathride58
e26f1cd78b Merge pull request #6553 from Citadel-Station-13/upstream-merge-37165 
[MIRROR] NTNet improvements!
 2018-05-02 01:17:10 +00:00
deathride58
e8f4602716 Update implant.dm 2018-05-01 21:16:05 -04:00
Jordan Brown
d47b71cf23 Merge pull request #37475 from 81Denton/OH-YEAH-BROTHER 
H.O.G.A.N. lawset
 2018-05-01 15:40:09 -05:00
Jordan Brown
dc9ce0cc6f Merge pull request #37590 from 81Denton/cargo-categories 
Reorganizes cargo's big "miscellaneous supplies" category
 2018-05-01 15:37:54 -05:00
Jordan Brown
56bc188abb Merge pull request #37580 from 81Denton/craftable-hudsunglasses 
Craftable HUDsunglasses
 2018-05-01 15:35:22 -05:00
europax
2fe4591a12 Adds 5 new drinks 2018-05-01 13:42:48 -05:00
AnturK
76302a217e Readds missing nuked narsie cinematic. (#37584) 2018-05-01 11:05:16 -05:00
Jordan Brown
453bd38ca5 Merge pull request #37516 from XDTM/LinearBrainDamage 
Changes the trauma formula so constant small ticks don't keep triggering traumas
 2018-05-01 09:56:39 -05:00
Tad Hardesty
34321883cc Fix placing boxes in storage implants 2018-05-01 07:30:07 -05:00