shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,318 Commits 5 Branches 0 Tags
0c5912c8341dbf5aa6656aa296eedc3612e6c740
Commit Graph

6098 Commits

Author SHA1 Message Date
LetterJay
0c5912c834 Merge pull request #6635 from Citadel-Station-13/upstream-merge-37626 
[MIRROR] You can no longer print infinite ammunition.
 2018-05-04 22:54:00 -05:00
LetterJay
4f3f344369 Merge pull request #6643 from Citadel-Station-13/upstream-merge-37637 
[MIRROR] fixes a sentence ot spelled correctly.
 2018-05-04 22:52:32 -05:00
LetterJay
354371fcfc Merge pull request #6631 from Citadel-Station-13/upstream-merge-37621 
[MIRROR] Corrects brainwashing surgery program category
 2018-05-04 22:51:58 -05:00
Armhulen
a00364268e ot dealing with bad grammar today (#37637) 2018-05-04 06:50:34 -05:00
CitadelStationBot
d574fc5590 Merge pull request #6622 from Citadel-Station-13/upstream-merge-37289 
[MIRROR] Science can now print off processors as well
 2018-05-03 09:07:59 -05:00
CitadelStationBot
4dc647d8ff Merge pull request #6626 from Citadel-Station-13/upstream-merge-37595 
[MIRROR] Plasmamen organs GET sprites!
 2018-05-03 09:02:15 -05:00
CitadelStationBot
a351edea90 Merge pull request #6625 from Citadel-Station-13/upstream-merge-37414 
[MIRROR] Removes stock market
 2018-05-03 09:01:12 -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
5c758e2f3a Merge pull request #37621 from ShizCalev/brainwash-uplink-loc 
Corrects brainwashing surgery program category
 2018-05-03 08:41:23 -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
Grandmother of 50
26fa3e1d12 Update machine_designs.dm (#37289) 2018-05-02 16:12:28 -05: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
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
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
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
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
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
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
Jordan Brown
d9c368a2a4 Merge pull request #37562 from AutomaticFrenzy/patch/corpse-runtimes 
Fix runtimes in corpse code due to mob_spawners becoming null
 2018-04-30 21:19:22 -05:00
Jordan Brown
c869ad12bd Merge pull request #37572 from deathride58/fixesdepression 
Fixes the intergalactic stock market crash by removing the speculation/performance modifier
 2018-04-30 21:14:22 -05:00
Alomga
90ecbf6bb9 Makes dizziness work again 2018-04-30 13:38:12 -05:00
Jordan Brown
9c9b2feefc Merge pull request #37510 from JJRcop/throw_myself 
Circuits can't throw themselves
 2018-04-30 13:04:19 -05:00
Jordan Brown
12eb6a8a97 Merge pull request #37513 from ShizCalev/pineapple-memes 
Adds traits for a character's preference towards pineapples.
 2018-04-30 13:02:05 -05:00
Jordan Brown
a9d452a24d Merge pull request #37549 from ShizCalev/bounce_away-fixes 
Resolved var name conflict for bounce_away()
 2018-04-30 12:51:40 -05:00
Jordan Brown
bf0fe93f35 Merge pull request #37556 from 81Denton/techweb-sunglasses 
More holosigns for techwebs
 2018-04-30 12:48:12 -05:00
Jordan Brown
8f1bb462ad Merge pull request #37554 from DaxDupont/vents 
Adds some more reagents to clogged vents
 2018-04-30 12:46:58 -05:00
LetterJay
94bebc33a0 Merge pull request #6590 from Citadel-Station-13/upstream-merge-37494 
[MIRROR] [s] Small tweaks and fixes a edgecase with machine construction
 2018-04-30 11:03:33 -05:00
LetterJay
34ce5380d6 Merge pull request #6589 from Citadel-Station-13/upstream-merge-37500 
[MIRROR] Removed /obj/item/asteroid path
 2018-04-30 11:03:16 -05:00
LetterJay
372e363257 Merge pull request #6588 from Citadel-Station-13/upstream-merge-37437 
[MIRROR] Fixes circuits being able to detect ghosts and fix pinless guns
 2018-04-30 11:02:58 -05:00
LetterJay
fcb1261c13 Merge pull request #6586 from Citadel-Station-13/upstream-merge-37503 
[MIRROR] Fixes Blast Cannon
 2018-04-30 11:02:16 -05:00