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

3787 Commits

Author SHA1 Message Date
LetterJay 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
LetterJay 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
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 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
vuonojenmustaturska 3fc7b4ca3b Merge pull request #37577 from kevinz000/patch-495 
Removes a duplicate comsig I accidently added
 2018-04-30 09:32:58 -05:00
Jalleo 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
vuonojenmustaturska 665bd35f78 Merge pull request #37499 from ShizCalev/bikehorn-fix 
Fixes bikehorn mood event
 2018-04-30 04:55:47 -05:00
Dax Dupont 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
kevinz000 3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
pigeons 07bbc4d3af Actually links mineral sprites with their new location (#37564) 
Fixes sprites being broken
 2018-04-29 19:06:14 -05:00
deathride58 6f13d2c2e9 Merge pull request #6546 from Citadel-Station-13/upstream-merge-37380 
[MIRROR] Refactors and fixes RPEDs
 2018-04-29 22:45:28 +00:00
Armhulen 814dc3f811 fixes a pacifism kill through crushing firelocks! (#37511) 
* fix!

* ORANGES LOOK AWAY

* thanks maintainer
 2018-04-29 10:09:29 -05:00
LetterJay c287c3a84c Merge pull request #6548 from Citadel-Station-13/upstream-merge-37483 
[MIRROR] Fixes obj descs and adds missing ones
 2018-04-29 02:29:44 -05:00
LetterJay 71b362e41e Merge pull request #6547 from Citadel-Station-13/upstream-merge-37473 
[MIRROR] Lets quantum pads be used by sillycones properly.
 2018-04-29 02:29:05 -05:00
LetterJay f606430d2b Merge pull request #6545 from Citadel-Station-13/upstream-merge-37478 
[MIRROR] [s] Fixes turret exploits
 2018-04-29 02:28:14 -05:00
LetterJay 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
LetterJay 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
LetterJay b565ef9171 Merge pull request #6557 from Citadel-Station-13/upstream-merge-37384 
[MIRROR] Re-adds and reworks fusion.
 2018-04-28 14:07:08 -05:00
LetterJay 811cc06188 Merge pull request #6536 from Citadel-Station-13/upstream-merge-37436 
[MIRROR] Adds a stationloving component to replace a couple of flags and SSinbounds with
 2018-04-28 01:36:04 -05:00
as334 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
oranges 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
81Denton b368ab377b fixes obj descs and adds new ones (#37483) 2018-04-27 13:21:08 -05:00
kevinz000 73d5c92c2b Quantum pad interaction (#37473) 2018-04-27 13:17:52 -05:00
Dax Dupont 4850230fc4 Refactors and fixes RPEDs 2018-04-27 13:13:37 -05:00
ShizCalev 185a6c4a90 Fixes turret exploits (#37478) 2018-04-27 13:12:24 -05:00
Dax Dupont 6ea9eaf06d Adds logging for PDA explosions (#37465) 
* Adds logging for PDA explosions

* Adds antag status
 2018-04-27 13:11:02 -05:00
deathride58 ab3c55ab23 replaces randomized wires with departmental wires (#6376) 2018-04-27 07:42:09 -07:00
deathride58 862898526d Gamemode and gamemode vote obfuscation (Plus hub entry rework) (#6276) 
* adds gamemode/gamemode vote obfuscation, redesigns hub entry

* ternaries: the easiest way to obfuscate your code to the point where even you can't read it

* FUCK

* changes the inaccuracy chance from 1/10 to 1/5
 2018-04-27 07:40:45 -07:00
vuonojenmustaturska d6b48869d8 Adds a stationloving component to replace a couple of flags and SSinbounds with (#37436) 
* station lovin' happened so fast

* Update stationloving.dm

* less qdel memes

* imbue soul signal

* rename imbue soul signal

* dupemode

* henk

* Update atoms_movable.dm

* Update nuclearbomb.dm

* Update nuclearbomb.dm
 2018-04-27 07:37:15 -05:00
deathride58 532ccc412c Merge pull request #6532 from Citadel-Station-13/upstream-merge-37373 
[MIRROR] Fixes missing augmentation hands
 2018-04-27 09:42:46 +00:00
deathride58 52e35b230f Merge pull request #6529 from Citadel-Station-13/upstream-merge-37441 
[MIRROR] Analyzers show temperature in Kelvin as well as Celsius now
 2018-04-27 09:41:46 +00:00
deathride58 d972ecc891 Merge pull request #6523 from Citadel-Station-13/upstream-merge-37407 
[MIRROR] Removes Acid from Remaining Circuits
 2018-04-27 09:39:29 +00:00
deathride58 2ee4d3e77d Merge pull request #6515 from Citadel-Station-13/upstream-merge-37326 
[MIRROR] Removes SCP_294
 2018-04-27 09:35:43 +00:00
deathride58 13c28b9ff1 Merge pull request #6513 from Citadel-Station-13/upstream-merge-37403 
[MIRROR] Adds grind_results to coins and diamonds
 2018-04-27 09:34:49 +00:00
deathride58 35e8ac1240 Merge pull request #6492 from Citadel-Station-13/upstream-merge-37364 
[MIRROR] Removes the ability for inducers and circuits to charge energy weapons.
 2018-04-27 09:21:07 +00:00
ShizCalev 9e3f99092f Fixes missing augmentation hands (#37373) 2018-04-27 02:42:13 -05:00
MrDoomBringer 18716c03a5 Analyzers show temperature in Kelvin as well as Celsius now (#37441) 
* - Introduces a non-linear component to liver damage from alcohol so weak alcohol doesn't kill you instantly. (#36089)

* wew

* nicbn
 2018-04-27 02:28:21 -05:00
LetterJay 72ddaee4a3 Merge pull request #6502 from Citadel-Station-13/upstream-merge-37363 
[MIRROR] Makes radiation collectors buildable
 2018-04-27 00:10:52 -05:00
Jordan Brown 4838bfec4e Merge pull request #37407 from Fox-McCloud/circuits-reagents 
Removes Acid from Remaining Circuits
 2018-04-26 15:24:26 -05:00
deathride58 132ae3a657 what the fuck is this shitcode 2018-04-26 09:28:34 -04:00
Armhulen 17aa0acef8 Removes SCP_294 (#37326) 
* aaah sweet essence

* bye bye sprites

* goodbye machine code

* bye bye blacklist entry

* whoops

* scp gone from runtime

* bye bye ract

* bye bye space ruin folder

* bye bye area
 2018-04-25 10:05:57 -05:00
81Denton d2885c84b7 adds grind_results to coins and diamonds (#37403) 2018-04-25 06:04:18 -05:00
Dax Dupont d5c2d37e39 Makes radiation collectors buildable (#37363) 
* Makes radiation collectors buildable

* capitalism at it's finest

* a
 2018-04-24 07:13:16 -05:00
Jordan Brown e52fafcbb7 Merge pull request #37364 from Jalleo/Inducer_change 
Removes the ability for inducers and circuits to charge energy weapons.
 2018-04-23 08:47:55 -05:00
Poojawa 0d5d992732 compile fixes + initial map port 2018-04-23 03:37:10 -05:00
Poojawa cc6b320f83 game folder 2018-04-23 00:17:28 -05:00
LetterJay e97db8a33c Merge pull request #6481 from Citadel-Station-13/upstream-merge-37339 
[MIRROR] Fixes a lack of feedback when entering too many points for the gulag.
 2018-04-22 22:23:07 -05:00
LetterJay fb267270ec Merge pull request #6478 from Citadel-Station-13/upstream-merge-37315 
[MIRROR] Gives beer and soda dispensers their own circuitboards and Design ID's
 2018-04-22 22:22:03 -05:00
LetterJay 7bf8b9654e Merge pull request #6473 from Citadel-Station-13/upstream-merge-37306 
[MIRROR] Fixes falsewall letting through air.
 2018-04-22 22:20:22 -05:00
Dax Dupont af48fe9dcf Fixes a lack of feedback when entering too many points for the gulag. (#37339) 2018-04-22 19:42:47 -05:00