shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,892 Commits 5 Branches 0 Tags
5014bdf6ee92aff710eaef4e1ea4ce6cfed85f66
Commit Graph

3741 Commits

Author SHA1 Message Date
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
iksyp
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
AnturK
1c390cbbc5 Fixes falsewall letting through air. (#37306) 
* Fixes falsewall letting through air.

* define
 2018-04-22 19:15:51 -05:00
Jordan Brown
70a0db6173 Merge pull request #37310 from Jalleo/apc_control_changes 
Fixes and optimises apc_control.dm a tad.
 2018-04-22 09:31:10 -05:00
LetterJay
2b70e9a3ae Merge pull request #6466 from Citadel-Station-13/upstream-merge-37312 
[MIRROR] [s] You can no longer buckle anchored mobs to things.
 2018-04-22 02:46:53 -05:00
LetterJay
3966683e17 Merge pull request #6460 from Citadel-Station-13/upstream-merge-37280 
[MIRROR] Removes random spawn
 2018-04-22 02:46:38 -05:00
LetterJay
930c9bf58c Merge pull request #6459 from Citadel-Station-13/upstream-merge-37281 
[MIRROR] Removes old decal system
 2018-04-22 02:46:25 -05:00
LetterJay
dc9b7d78f6 Merge pull request #6455 from Citadel-Station-13/upstream-merge-37282 
[MIRROR] Fixes capacitor not being consumed when building a gygax
 2018-04-22 02:45:32 -05:00
LetterJay
8cdbc9ef5e Merge pull request #6452 from Citadel-Station-13/upstream-merge-37268 
[MIRROR] Fixes SCP ruin turret faction, fixes hostile mobs attacking turrets in the same faction
 2018-04-22 02:44:56 -05:00
LetterJay
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
LetterJay
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
LetterJay
d2ce7da6cb Merge pull request #6453 from Citadel-Station-13/upstream-merge-37251 
[MIRROR] Adds new window spawners
 2018-04-22 02:35:09 -05:00
LetterJay
96a461e384 Merge pull request #6451 from Citadel-Station-13/upstream-merge-37218 
[MIRROR] Couple of fixes for situations involving mechas and the clock cult gamemode
 2018-04-22 02:34:53 -05:00
LetterJay
80f4522967 Merge pull request #6450 from Citadel-Station-13/upstream-merge-37252 
[MIRROR] Fixes lavaland syndie base rads + SSU compartment issues
 2018-04-22 02:34:03 -05:00
Jordan Brown
0586f69637 Merge pull request #37312 from DaxDupont/tendril 
[s] You can no longer buckle anchored mobs to things.
 2018-04-20 10:47:28 -05:00
AnturK
b0e97784da Removes random spawn (#37280) 2018-04-19 05:46:39 -05:00
Emmett Gaines
a465733b1c Removes old decal system (#37281) 2018-04-19 05:45:25 -05:00
AlexTheSysop42
19f315db9c Fixes capacitor not being consumed when building a gygax (#37282) 
* Comments out code to try to fix a bug

* protip: next time don't commit to master

* Fixes gygax construction not using the capacitor
 2018-04-18 15:46:25 -05:00
ShizCalev
79863a5ffb Adds new window spawners 2018-04-18 13:51:53 -05:00
Jordan Brown
44df2b780e Merge pull request #37268 from ShizCalev/scp-ruin-fix 
Fixes SCP ruin turret faction, fixes hostile mobs attacking turrets in the same faction
 2018-04-18 11:34:06 -05:00
vuonojenmustaturska
32fe9d4fd6 Couple of fixes for situations involving mechas and the clock cult gamemode (#37218) 
* couple of mech fixes

* safety

* gateway, gravity gen

* Restores oingo-boingo punch-nuke
 2018-04-18 09:33:31 -05:00
81Denton
7caad40e3f Fixes lavaland syndie base rads + SSU compartment issues (#37252) 
* radsuit SSU, syndie lava base rad protection

* re-adds missing combat gloves

* defines radsuit SSU name by the obj
 2018-04-18 07:02:10 -05:00
PKPenguin321
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
AnturK
31efa96a01 Fixes some defines. (#37223) 2018-04-16 08:32:48 -05:00
Grandmother of 50
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 Ginnane
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
deathride58
fc035e2b61 Merge pull request #6407 from Citadel-Station-13/upstream-merge-37176 
[MIRROR] Removes startup message in sql log
 2018-04-14 20:38:33 +00:00
deathride58
6923c83762 Merge pull request #6377 from Citadel-Station-13/upstream-merge-36417 
[MIRROR] RPD pipe autowrenching
 2018-04-14 20:37:42 +00:00
Jordie
9ce8aae7dd removes startup message in sql log (#37176) 2018-04-14 08:11:20 -05:00
LetterJay
a861726664 Merge pull request #6379 from Citadel-Station-13/upstream-merge-37125 
[MIRROR] Shuttle window spawner name fix
 2018-04-14 07:46:04 -05:00
LetterJay
6b3a59b028 Merge pull request #6372 from Citadel-Station-13/upstream-merge-37117 
[MIRROR] Removes some duplicated code
 2018-04-14 07:45:15 -05:00
LetterJay
86ca6b424d Merge pull request #6366 from Citadel-Station-13/upstream-merge-37122 
[MIRROR] Fixes interaction AI stuff
 2018-04-14 07:44:50 -05:00
LetterJay
5d5dc5483e Merge pull request #6399 from Citadel-Station-13/upstream-merge-37158 
[MIRROR] Cleans up CENTCOM morgue/chapel/library doors
 2018-04-14 07:42:57 -05:00
ShizCalev
5dfd1f7d42 grunge airlock 2018-04-13 09:04:55 -05:00
ShizCalev
38b2460760 Fixes bad span class for cham projector warning (#37140) 2018-04-13 07:49:54 -05:00
LetterJay
3cd0591d90 Merge pull request #6334 from Citadel-Station-13/upstream-merge-36858 
[MIRROR] Use a rust DLL for logging
 2018-04-12 07:06:08 -05:00
LetterJay
8e293a20aa Update asteroid.dm 2018-04-12 07:04:33 -05:00
vuonojenmustaturska
bc68ed8536 Merge pull request #37125 from 81Denton/shuttle-window-name 
Shuttle window spawner name fix
 2018-04-12 06:37:25 -05:00
deathride58
d8e3200d6c Merge pull request #6287 from Citadel-Station-13/upstream-merge-36953 
[MIRROR] Stack Sheets Cancel Button
 2018-04-11 21:40:22 +00:00
deathride58
2658200472 Merge pull request #6337 from Citadel-Station-13/upstream-merge-37070 
[MIRROR] Fixes eminences not being recognized as servants of ratvar
 2018-04-11 21:39:39 +00:00
Dennok
105e55068b RPD pipe autowrenching (#36417) 
* RPD autowrenching

* up

add toggle, remove auto unwrenching
 2018-04-11 16:36:56 -05:00
deathride58
ce946619b3 Merge pull request #6348 from Citadel-Station-13/upstream-merge-37088 
[MIRROR] Fix double-fullstop in the jukebox's description
 2018-04-11 21:35:21 +00:00
deathride58
6d1ee7c6e9 Merge pull request #6351 from Citadel-Station-13/upstream-merge-36604 
[MIRROR] Code improvements on bullet damage decals
 2018-04-11 21:34:32 +00:00
deathride58
6c107f538a Merge pull request #6361 from Citadel-Station-13/upstream-merge-37107 
[MIRROR] Fixes jukebox ghost message spam
 2018-04-11 21:29:28 +00:00
deathride58
1f44356e49 Merge pull request #6364 from Citadel-Station-13/upstream-merge-37120 
[MIRROR] [s] Adds a centcom level check to launchpad.
 2018-04-11 21:28:50 +00:00
ninjanomnom
5af97c3edc Removes some duplicated code 2018-04-11 15:01:10 -05:00
vuonojenmustaturska
d559fc1bd3 remove 512 version checks 2018-04-11 14:26:41 -05:00