shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,157 Commits 5 Branches 0 Tags
94bebc33a0cf9b51ad164e0c03394e411ec3d097
Commit Graph
1229 Commits
Author SHA1 Message Date
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
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
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
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
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
Dax DupontandCitadelStationBot 6ea9eaf06d Adds logging for PDA explosions (#37465) 
* Adds logging for PDA explosions

* Adds antag status
 2018-04-27 13:11:02 -05:00
deathride58andGitHub 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
deathride58andGitHub 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
deathride58andGitHub 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
deathride58andGitHub 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
deathride58andGitHub 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
ShizCalevandCitadelStationBot 9e3f99092f Fixes missing augmentation hands (#37373) 2018-04-27 02:42:13 -05:00
MrDoomBringerandCitadelStationBot 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
LetterJayandGitHub 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 BrownandCitadelStationBot 4838bfec4e Merge pull request #37407 from Fox-McCloud/circuits-reagents 
Removes Acid from Remaining Circuits
 2018-04-26 15:24:26 -05:00
deathride58andGitHub 132ae3a657 what the fuck is this shitcode 2018-04-26 09:28:34 -04:00
81DentonandCitadelStationBot d2885c84b7 adds grind_results to coins and diamonds (#37403) 2018-04-25 06:04:18 -05:00
Dax DupontandCitadelStationBot 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 BrownandCitadelStationBot 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
iksypandCitadelStationBot e8698ab798 Gives beer and soda dispensers their own circuitboards and Design ID's (#37315) 
* new boards

* new boards installed

* new designs (wow) (woah)

* added the new design ids to the biotech node

* tested

it works, also, that typo fucking stopped it from compiling
 2018-04-22 19:19:51 -05:00
LetterJayandGitHub 68a1d541b1 Merge pull request #6441 from Citadel-Station-13/upstream-merge-37223 
[MIRROR] Fixes some defines and value
 2018-04-22 02:43:26 -05:00
LetterJayandGitHub d0db0f0c85 Merge pull request #6436 from Citadel-Station-13/upstream-merge-37141 
[MIRROR] Repeat of "I don't recall an arcade machine being th... GLORF (Chameleon Projector Change)"
 2018-04-22 02:41:57 -05:00
PKPenguin321andCitadelStationBot ddb6f7ebae Esword cig lighting messages fix (#37216) 
* fix esword cig lighting message

`Jeb Ray swings their the energy sword. They light the cigarette in the process.` becomes `Jeb Ray swings their energy sword. They light their cigarette in the process.`

* fix desword cig lighting message

`Jeb Ray swings his the double-bladed energy sword (Wielded). he lights the cigarette in the process.` becomes `Jeb Ray swings their double-bladed energy sword (Wielded). They light their cigarette in the process.`

* check fix

* desword check fix

* suggested message replacement

* suggested message change desword
 2018-04-16 19:20:26 -05:00
AnturKandCitadelStationBot 31efa96a01 Fixes some defines. (#37223) 2018-04-16 08:32:48 -05:00
Grandmother of 50andCitadelStationBot 0fca7cf7f0 Repeat of "I don't recall an arcade machine being th... GLORF (Chameleon Projector Change)" (#37141) 
* Update chameleonproj.dm

* Pseudo Lings need not apply

* Update chameleonproj.dm

* Update chameleonproj.dm
 2018-04-16 04:39:57 -05:00
John GinnaneandCitadelStationBot d63b549302 Sender of PDA messages is told when their message is sent (#37055) 
* Adds "sent message" to the sender of PDA messages

* Added span to message
 2018-04-14 16:13:50 -05:00
deathride58andGitHub 6923c83762 Merge pull request #6377 from Citadel-Station-13/upstream-merge-36417 
[MIRROR] RPD pipe autowrenching
 2018-04-14 20:37:42 +00:00
ShizCalevandCitadelStationBot 38b2460760 Fixes bad span class for cham projector warning (#37140) 2018-04-13 07:49:54 -05:00
DennokandCitadelStationBot 105e55068b RPD pipe autowrenching (#36417) 
* RPD autowrenching

* up

add toggle, remove auto unwrenching
 2018-04-11 16:36:56 -05:00
deathride58andGitHub 5669e6a0a1 Merge branch 'master' into upstream-merge-36953 2018-04-10 07:21:55 +00:00
deathride58 87365ee74b getStaminaLoss() 2018-04-07 23:39:48 -04:00
Poojawaanddeathride58 5fa001c10f things with stuff (#6233) 
* buncha things from upstream

* datums globals, onclick

* datums

* game folder, holy shit mirror bot why

* modules

* icons

* dme

* compiles cleanly

* tools purge

* updates maps

* double check just because. and wew lad

* incidentally, this needs more work first

* some things

* weh

* sound cleanup and icons

* reeeee

* compile issues

* oh look, fresh code sync

* cleans up some unused icons

* dirty vars

* reeeeeeeeeeeeeeee

* wew lad. fuck off with this already
 2018-04-07 23:07:09 -04:00
deathride58andGitHub e54029a382 Update stack.dm 2018-04-06 20:51:39 -04:00
TlaltecuhtliandCitadelStationBot 4f7d35ec4f fixes #34388 by adding cam (#36627) 
* wip fixes #34388

🆑 
fix:stuff
🆑

* vv

* ASDASD

* daikshu

* wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww

* wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww

* 99999999999999999999999999999

* *tabs*

* Update comp_board_designs.dm
 2018-04-06 09:24:47 -05:00
Davidj361andCitadelStationBot 1164cec64d Stack Sheets Cancel Button 2018-04-06 03:46:47 -05:00
John GinnaneandCitadelStationBot 80fee95dab Fixed sometimes using items on full storage items (#36711) 
* Fixed sometimes using items on full storage items

* Removed redundant code and fixed spray being used on container
 2018-04-03 22:02:39 -05:00
deathride58andGitHub edccb8b3e4 Merge pull request #6153 from Citadel-Station-13/upstream-merge-36442 
[MIRROR] Refactors Spell and Martial Art Books to use Action Granters!
 2018-04-03 08:16:11 +00:00
iksypandCitadelStationBot 496f73bc56 implant_loyality.dm has been changed to implant_mindshield.dm, better reflecting it's contents and removing a typo (#36855) 
* loyality

*fixed a bug that made coding relating to loyalty implants basically impossible

* did i say loyalty i meant mindshield

* and the .dme as well

this commit and last were webeditor but it should work
 2018-04-02 19:46:01 -05:00
LetterJayandGitHub f7be23e78a Merge branch 'master' into upstream-merge-36442 2018-04-01 19:50:37 -05:00
vuonojenmustaturskaandCitadelStationBot 76a9540f80 Merge pull request #36851 from 81Denton/bs-polycrystal-name 
Adds singular_name to BS polycrystals
 2018-04-01 07:27:45 -05:00
LetterJayandGitHub c19f285322 Merge pull request #6179 from Citadel-Station-13/upstream-merge-36807 
[MIRROR] Fixes some edge cases with chameleon projectors and sleepers
 2018-04-01 01:03:10 -05:00
LetterJayandGitHub 05e85ddfb0 Merge pull request #6168 from Citadel-Station-13/upstream-merge-36625 
[MIRROR] Fixes blueprints exploit
 2018-03-31 06:21:14 -05:00
LetterJayandGitHub 71af2a9bc5 Merge pull request #6154 from Citadel-Station-13/upstream-merge-36477 
[MIRROR] Science goggles detect grenade reagents
 2018-03-31 06:17:37 -05:00