shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
17,985 Commits 5 Branches 0 Tags
ff8a90b88034a340bc63e070985c24cc43f5e0f0
Commit Graph
2143 Commits
Author SHA1 Message Date
kevinz000andletterjay 9d39b2859a Geiger counters can now scan the radiation of anything! (#37688) 2018-05-07 13:51:26 -05:00
deathride58andGitHub c1755468b7 Update reverse_bear_trap.dm 2018-05-07 08:50:32 -04:00
deathride58andGitHub 8bc97a10d6 Merge pull request #6667 from Citadel-Station-13/upstream-merge-37676 
[MIRROR] Prevents electric grills from mass producing lightning through exploits
 2018-05-07 12:44:12 +00:00
deathride58andGitHub 757cd6aa73 Merge pull request #6668 from Citadel-Station-13/upstream-merge-37680 
[MIRROR] Improves skittish code
 2018-05-07 12:43:47 +00:00
vuonojenmustaturskaandCitadelStationBot 4b36831fbe Merge pull request #37681 from kevinz000/patch-499 
Fixes supply pod duping
 2018-05-06 16:38:08 -05:00
vuonojenmustaturskaandCitadelStationBot 8e791af911 Merge pull request #37680 from kevinz000/patch-498 
Improves skittish code
 2018-05-06 16:37:57 -05:00
vuonojenmustaturskaandCitadelStationBot ed41503127 Merge pull request #37676 from AverageJoe82/electric-grill-engine 
Prevents electric grills from mass producing lightning through exploits
 2018-05-06 16:37:49 -05:00
ShizCalevandCitadelStationBot 6415ecdbe9 Shows assemblies some love. ♥ 2018-05-06 16:37:40 -05:00
orangesandCitadelStationBot e0412f6325 Renames trait datums/character traits to quirks to differentiate them from the other trait system in the code 2018-05-06 16:37:13 -05:00
deathride58andGitHub 50f8779fc0 Merge branch 'master' into upstream-merge-37486 2018-05-06 07:15:48 +00:00
deathride58andGitHub d4d052bae2 Update radio.dm 2018-05-06 03:10:20 -04:00
deathride58andGitHub 6a07a66cb3 Merge branch 'master' into upstream-merge-37476 2018-05-06 07:07:02 +00:00
81DentonandCitadelStationBot d44b1b9b2e Adds desc to vendor circuit board (#37647) 
* FEED ME A STRAY CAT

* forgive me for I have web edited

* AAAAAHH
 2018-05-05 17:54:54 -05:00
LetterJayandGitHub f387bb1694 Merge pull request #6633 from Citadel-Station-13/upstream-merge-37622 
[MIRROR] Changes cockroach guts to insect guts
 2018-05-05 09:40:11 -05:00
orangesandCitadelStationBot d5be66cf9a Crayons no longer use charge when used on a canvas 2018-05-04 22:27:00 -05:00
ShizCalevandCitadelStationBot b5a95e9da8 Makes more messages pronoun sensitive 2018-05-03 17:46:25 -05:00
CitadelStationBotandGitHub a351edea90 Merge pull request #6625 from Citadel-Station-13/upstream-merge-37414 
[MIRROR] Removes stock market
 2018-05-03 09:01:12 -05:00
Jordan BrownandCitadelStationBot deddd8debe Merge pull request #37622 from ShizCalev/cockarock 
Changes cockroach guts to insect guts
 2018-05-03 08:42:46 -05:00
pigeonsandCitadelStationBot 2702788dac Removes stock market 2018-05-02 17:48:55 -05:00
MickyanandCitadelStationBot 5596472fc1 fixes midori cigs being empty (#37615) 2018-05-02 17:31:14 -05:00
vuonojenmustaturskaandCitadelStationBot 0958d35b26 replaces BANG_PROTECT_2 with a component, also kills OMNITONGUE_2 and flags_2 2018-05-02 13:14:43 -05:00
deathride58andGitHub 892cb0a1be Update reverse_bear_trap.dm 2018-05-02 10:35:31 -04:00
deathride58andGitHub 3f50934c92 Update headset.dm 2018-05-02 10:34:45 -04:00
deathride58andGitHub 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
deathride58andGitHub 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
deathride58andGitHub fa5db57b56 Merge pull request #6600 from Citadel-Station-13/upstream-merge-37568 
[MIRROR] Removes enriched uranium
 2018-05-02 01:26:27 +00:00
deathride58andGitHub 4851b9bd82 Merge pull request #6559 from Citadel-Station-13/upstream-merge-37501 
[MIRROR] Fixes missing icons
 2018-05-02 01:19:58 +00:00
deathride58andGitHub e26f1cd78b Merge pull request #6553 from Citadel-Station-13/upstream-merge-37165 
[MIRROR] NTNet improvements!
 2018-05-02 01:17:10 +00:00
Jordan BrownandCitadelStationBot d47b71cf23 Merge pull request #37475 from 81Denton/OH-YEAH-BROTHER 
H.O.G.A.N. lawset
 2018-05-01 15:40:09 -05:00
LetterJayandGitHub 154ab5022b Merge pull request #6576 from Citadel-Station-13/upstream-merge-37564 
[MIRROR] Actually links mineral sprites with their new location
 2018-04-30 22:34:53 -05:00
Jordan BrownandCitadelStationBot c4d461f3be Merge pull request #37568 from pigeonsk/removeenruranium 
Removes enriched uranium
 2018-04-30 21:15:35 -05:00
LetterJayandGitHub 7205a15ef7 Merge pull request #6591 from Citadel-Station-13/upstream-merge-37577 
[MIRROR] Removes a duplicate comsig I accidently added
 2018-04-30 11:06:19 -05:00
LetterJayandGitHub 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
LetterJayandGitHub a082da66f3 Merge pull request #6587 from Citadel-Station-13/upstream-merge-37499 
[MIRROR] Fixes bikehorn mood event
 2018-04-30 11:02:36 -05:00
vuonojenmustaturskaandCitadelStationBot 3fc7b4ca3b Merge pull request #37577 from kevinz000/patch-495 
Removes a duplicate comsig I accidently added
 2018-04-30 09:32:58 -05:00
JalleoandCitadelStationBot 987cce76ed [s] Small tweaks and fixes a edgecase with machine construction (#37494) 
* Puts back required time for the emitter and field_generator and also removes a certain issue that certain people were causing

* Couple of things I missed

* I noticed the error with regards to atom and changed to obj like I was trying to originally. Also its fine to build on tables that wasnt the issue with this specific aspect.

* Edge windows. We need those.

* optimised the checks to be behind a if check for when you are actually needing to make something for the floor...

* Corrects a input proc by request

* Working is not my strong suit.
 2018-04-30 05:00:24 -05:00
vuonojenmustaturskaandCitadelStationBot 665bd35f78 Merge pull request #37499 from ShizCalev/bikehorn-fix 
Fixes bikehorn mood event
 2018-04-30 04:55:47 -05:00
Dax DupontandCitadelStationBot a705b2c31c Adds a cooldown to PDA send to all messages. (#37422) 
* Adds a cooldown to PDA send to all messages.

* aaa

aaa

* forgot this one

* condom
 2018-04-30 01:08:03 -05:00
kevinz000andPoojawa 3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
pigeonsandCitadelStationBot 07bbc4d3af Actually links mineral sprites with their new location (#37564) 
Fixes sprites being broken
 2018-04-29 19:06:14 -05:00
vuonojenmustaturskaandCitadelStationBot f373b2c9e6 Kills off three more flags from flags_2 2018-04-29 17:30:55 -05:00
LetterJayandGitHub 53ee2ab0a9 Merge pull request #6543 from Citadel-Station-13/upstream-merge-37465 
[MIRROR] Adds logging for PDA explosions
 2018-04-29 02:25:10 -05:00
Jordan BrownandCitadelStationBot db142667b7 Merge pull request #37501 from ShizCalev/icon-fixes 
Fixes missing icons
 2018-04-28 14:54:45 -05:00
LetterJayandGitHub 803d3b59fd Merge pull request #6556 from Citadel-Station-13/upstream-merge-37497 
[MIRROR] Replaces a / with * as per Contributing.md [bscrystal.dm]
 2018-04-28 14:07:24 -05:00
vuonojenmustaturskaandCitadelStationBot 3f6167d08e Moves several clothing-specific flags from /atom to their proper type 2018-04-28 13:21:48 -05:00
as334andCitadelStationBot 9b36d6c4d9 Re-adds and reworks fusion. (#37384) 
add: Fusion is back
add: Fusion now happens with large quantities of hot plasma and CO2, consuming all the plasma rapidly and producing large amounts of energy. Other gases can also effect the performance of the reaction.
add: Fusion now produces radiation. Be careful around reactors.
fix: fixes fusion dividing by zero and destroying everything
code: Gas reactions now have access to where they are occurring
fix: Prevents some other reactions from producing matter from nothing
 2018-04-28 01:01:47 -05:00
orangesandCitadelStationBot 74a483d350 Merge pull request #37497 from ExcessiveUseOfCobblestone/patch-42 
Replaces a / with * as per Contributing.md [bscrystal.dm]
 2018-04-27 21:21:59 -05:00
pigeonsandCitadelStationBot 2b2ff05b73 Modified bomb and syndicate bomb spawner so Cuban Pete bombs maxcap and work again 2018-04-27 20:28:55 -05:00
kevinz000andCitadelStationBot 6ed120aad4 NTNet improvements! 2018-04-27 20:24:28 -05:00
orangesandCitadelStationBot 7d45e045a3 Uppercases slot defines. 2018-04-27 20:14:39 -05:00