shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
24,746 Commits 5 Branches 0 Tags
514b023779cbb2ee5f3d365744b605e84000f962
Commit Graph

3043 Commits

Author SHA1 Message Date
kevinz000
e226a79c9b Merge pull request #9198 from Trilbyspaceclone/A_Tailer's_art 
Code stuffs + more framework for cargo rework cuz atomic prs are good
 2019-10-22 23:11:56 -07:00
nik707
9a598a92cb Merge pull request #9561 from Ghommie/Ghommie-cit256 
Fixing some ayy overlays and client images oddities.
 2019-10-22 16:49:07 -05:00
nik707
fc56fd9f8b Merge pull request #9565 from Citadel-Station-13/kevinz000-patch-103 
Fixes and nerfs VTEC upgrades
 2019-10-22 16:48:10 -05:00
deathride58
2742c86723 Merge pull request #9072 from Poojawa/gen-poppers 
Genpop for security
 2019-10-21 21:15:01 -04:00
Trilbyspaceclone
b4b875bf26 Merge branch 'master' into A_Tailer's_art 2019-10-21 21:06:21 -04:00
BlackMajor
b77a94bd7d Merge pull request #9370 from Citadel-Station-13/kevinz000-patch-88 
buffs c4 on mobs
 2019-10-22 11:04:30 +13:00
kevinz000
c0d4d32dee Update robot_upgrades.dm 2019-10-21 14:36:21 -07:00
Ghommie
760522cf6a Fixing some ayy overlays and client images oddities. 2019-10-21 11:29:43 +02:00
TrilbySpaceClone
18c9283d4a Merge branch 'master' into A_Tailer's_art 2019-10-18 00:21:42 -04:00
kevinz000
a6acb212fa Merge pull request #9515 from Ghommie/Ghommie-cit241 
Porting "Moves machine/computer frames and structures below object layer." and lowering trays layer.
 2019-10-17 17:29:18 -07:00
kevinz000
1d0931ede9 Merge pull request #9505 from Thalpy/Smartdart-QoL 
[READY] Tweaks smartdarts with a few quality of life functions, and add a few new things.
 2019-10-17 13:23:33 -07:00
kevinz000
033cd3cc53 Merge pull request #9510 from Ghommie/Ghommie-cit240 
Fixing tracking implant teleport issues.
 2019-10-17 13:05:15 -07:00
kevinz000
d9cb2792e5 Merge pull request #9516 from Ghommie/Ghommie-cit242 
Ports "Fixes morgues being able to consume ghosts, AI-eyes, etc."
 2019-10-17 13:04:15 -07:00
kevinz000
8be030a931 Merge pull request #9482 from Thalpy/Wiki 
Gives chemistry a library (and updates buttons at the top right of the game too).
 2019-10-17 13:01:37 -07:00
kevinz000
65841a9485 Merge pull request #9507 from Ghommie/Ghommie-cit238 
Ports some in operator misuse bugfixes.
 2019-10-17 12:59:44 -07:00
Ghommie
57794421e3 Ports "Fixes morgues being able to consume ghosts, AI-eyes, etc." 2019-10-16 23:57:31 +02:00
Ghommie
f3a9cac11e Porting "Moves machine/computer frames and structures below object layer." and lowering trays layer. 2019-10-16 23:39:21 +02:00
kevinz000
994bfddc1b Merge pull request #9477 from Thalpy/tgOrganFixes 
[READY] Fixes a few organ code and lets organs freeze based on ambient temperature.
 2019-10-16 12:44:34 -07:00
kevinz000
7187da9e72 Merge pull request #9456 from Thalpy/Spookytime 
[READY] [Spookytime] Adds Jacqueline the Pumpqueen
 2019-10-15 23:11:35 -07:00
kevinz000
ae19dd16d8 Merge pull request #9486 from ZeroNetAlpha/Janiborg-noms 
Borgs are now consumable by scrub pups.
 2019-10-15 22:59:20 -07:00
Ghommie
7e3a812460 Fixing tracking implant teleport issues. 2019-10-15 21:32:01 +02:00
Thalpy
acc0ff8a17 Adds craftable extended mags 2019-10-15 12:37:35 +01:00
Thalpy
e71a70f406 Adds medolier + bag antics 2019-10-15 11:40:07 +01:00
Ghommie
0cb433ba99 Ports some in operator misuse bugfixes. 2019-10-15 00:26:13 +02:00
Fermi
7b2c8e58ff Fixes freezing and ghost rider 2019-10-14 13:23:39 +01:00
Ghommie
e969e89ce5 Well, byond quirks. 2019-10-14 03:09:15 +02:00
Ghommie
22fc7a9088 Resprites bedsheet bins in 3/4 perspective, adds towel bins subtype. 2019-10-14 02:32:23 +02:00
kevinz000
1fda4deef7 Merge pull request #9465 from Trilbyspaceclone/patch-230 
Update granters.dm
 2019-10-13 13:58:03 -07:00
Zna12
18f10afcd7 Borgs are now consumable by scrub pups. 2019-10-13 15:23:50 -05:00
Thalpy
150b20103e Random tab 2019-10-13 16:39:37 +01:00
Thalpy
7b27d9bd24 Library time 2019-10-13 16:19:32 +01:00
Thalpy
3abbfffdb8 Argh 2019-10-12 13:20:39 +01:00
Fermi
7bce68bb11 Merge branch 'master' into Spookytime 2019-10-11 21:51:48 +01:00
kevinz000
b56563fcfe Merge pull request #9374 from kappa-sama/walktime 
ashwalkers now have more messages telling them to not go on station
 2019-10-11 12:13:49 -07:00
kevinz000
9120e4b7c8 Merge pull request #9399 from Arturlang/patch-1 
[s] Adds a distance check to the supermatter tongs consume action, ported from TG
 2019-10-11 12:10:53 -07:00
kevinz000
b0b274762c Merge pull request #9441 from lolman360/whydowehave1000branches 
Ports /tg/ advanced surgerytools and tool defines.
 2019-10-11 12:10:31 -07:00
kevinz000
9cd75c82a4 Merge pull request #9435 from Linzolle/firefix 
fix fireman carry offhand not automatically deleting itself
 2019-10-11 12:09:14 -07:00
kevinz000
98d03c73be Merge pull request #9459 from dapnee/Imagine-people-reading-code-to-see-if-it-forgets-something 
Imagine Updating How Tables Work, But Forgetting MY TABLES
 2019-10-11 12:05:53 -07:00
kevinz000
1896b43c79 Merge pull request #9451 from Ghommie/Ghommie-cit224 
standarizes mobs' can_equip arguments.
 2019-10-11 12:05:12 -07:00
Fermi
dbcda948fb Darn thing 2019-10-11 19:56:58 +01:00
Trilbyspaceclone
7495de7d15 Update granters.dm 2019-10-11 14:04:08 -04:00
Dap
293034d815 Imagine Updating How Tables Work, But Forgetting MY TABLES 
## About The Pull Request

Let me just add in a single line so plasmaglass tables actually work.

## Changelog
🆑
fix: You can now make plasmaglass tables again.
/🆑
 2019-10-10 09:04:06 -06:00
kevinz000
3e6415d4b5 Merge pull request #9324 from Linzolle/crusher 
Ports "Adds toggleable light and blinking charging light to crusher" and "Lets the kinetic crusher be one-hand carried"
 2019-10-10 02:23:15 -07:00
kevinz000
236dcc4d63 Merge pull request #9452 from Ghommie/Ghommie-cit225 
Stops non-alphanumeric graffiti decals from being named "letter".
 2019-10-10 02:10:08 -07:00
kevinz000
0c9a065096 Merge pull request #8401 from Ghommie/Ghommie-cit11 
Refactoring Implants' loc n°3
 2019-10-10 02:09:37 -07:00
lolman360
c694cb8652 h 2019-10-09 13:35:23 +11:00
lolman360
645b8ddf39 cmo: the new CE 
loot him for tools
 2019-10-09 13:32:45 +11:00
Ghommie
cfccacafbf Stops all graffiti decals from being named "letter". 2019-10-09 01:54:38 +02:00
Ghommie
dac6fef57a Also implementing /tg/station pr #40767 2019-10-09 00:38:09 +02:00
lolman360
04521551f0 one commit wonder 2019-10-08 19:46:28 +11:00