shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
18,266 Commits 5 Branches 0 Tags
53df5ec85dd6c6bc276c3ff2b7e209e93031bcd0
Commit Graph

6808 Commits

Author SHA1 Message Date
kevinz000
53df5ec85d Update revolution.dm 2018-08-16 17:36:19 -07:00
deathride58
e902fa8b79 Clarifies the text in the panic bunker bounce message (#7454) 2018-08-16 13:02:48 -07:00
deathride58
f928c44440 Merge pull request #7442 from FlattestGuitar/vending-upgrade 
New vending machine UI
 2018-08-12 20:40:07 -04:00
deathride58
21c07e6f97 Merge pull request #7441 from FlattestGuitar/blur 
Blurry eyes just got blurrier
 2018-08-12 20:38:50 -04:00
Unknown
761f2f931b tweaks 2018-08-09 10:16:15 +02:00
Unknown
d6e6d0f70b Ports the lovely vending machine UI by Andrew Montagne from Oracle 2018-08-08 15:23:41 +02:00
Unknown
054be386de readded defines; tweaked size 2018-08-08 12:39:19 +02:00
Unknown
9ca7e38f7a Blurry eyes just got blurrier 2018-08-08 11:42:30 +02:00
kevinz000
0657990182 Update puzzle.dm 2018-08-07 04:46:41 -07:00
kevinz000
4ff02b5a8b Sliding Puzzle 2018-08-07 04:44:12 -07:00
deathride58
26a11df5c5 Merge pull request #7386 from Citadel-Station-13/photography_update 
Photography update - Photo persistence, 7x7 photos, adjustable camera photo size, photo logging with full metadata, etc etc
 2018-08-04 00:22:07 -04:00
deathride58
d79712cbbf Merge pull request #7404 from Citadel-Station-13/hairstyles 
Near full port of all virgo hairstyles and facial hairs (hair_* + facial_* from human_face_m.dmi on virgo codebase)
 2018-08-04 00:21:56 -04:00
deathride58
438daa7acf Merge pull request #7411 from Citadel-Station-13/kevinz000-patch-3 
Adds admin variable for atmospherics linking on portal guns
 2018-08-04 00:21:44 -04:00
deathride58
c4c7e162a1 Merge pull request #7433 from Citadel-Station-13/kevinz000-patch-11 
blocks aimbot exploit
 2018-08-04 00:08:34 -04:00
Hatterhat
72231976a7 Replaces plasma in execution syringes with amatoxin (#7360) 
* Removes plasma from execution syringes

holy shit what a meme

* Replaces initropidril with amatoxin

shit man idk lmao
 2018-08-03 19:30:10 -07:00
kevinz000
6353b26822 Update client_procs.dm 2018-08-03 19:26:41 -07:00
deathride58
6b88d1843d Merge pull request #7385 from Citadel-Station-13/kevinz000-patch-1 
removes flightsuits until pixel movement is out and i can redesign them
 2018-07-28 09:18:06 -04:00
deathride58
f637425108 Merge pull request #7387 from Citadel-Station-13/wormhole_update 
wormhole guns now pass through mobs without doing anything but gain hitscan
 2018-07-28 09:17:00 -04:00
kevinz000
9325319da1 Update special.dm 2018-07-26 16:44:08 -07:00
kevinz000
5b76760b29 Ports virgo hairstyles 2018-07-26 03:51:09 -07:00
kevinz000
03843f1b20 Update asset_cache.dm 2018-07-26 00:43:52 -07:00
kevinz000
5ccda57266 Update wormhole.dm 2018-07-24 01:06:37 -07:00
kevinz000
22069cd841 Update album.dm 2018-07-21 13:23:02 -07:00
kevinz000
e29016b257 Update wormhole.dm 2018-07-21 02:17:54 -07:00
kevinz000
6e03770b93 Wormhole Update 2018-07-21 01:07:21 -07:00
kevinz000
2a6e4fce59 Photography Update 2018-07-20 15:26:13 -07:00
deathride58
f1739cb482 Upstream fix mirror spree (#7362) 
* tgstation/tgstation#39025 - Fixes nukeop eshield not being buyable

* tgstation/tgstation#39011 - [s] Adds missing logging to the staff of storms

* tgstation/tgstation#38980 - Corrects a stat error in the Nuke Ops uplink

* tgstation/tgstation#38988 - Fixes blob victory.

* tgstation/tgstation#38990 - Allow players to un-ignore previously ignored popups for ghostroles, and ignore notifications with no ignore button

needs tgui recompile

* tgstation/tgstation#38994 - Fix timer bug

* TGUI recompile

* tgstation/tgstation#39035 - Fixes navigation computers.

* tgstation/tgstation#39043 - Fixes minor genetics scanner runtime

* tgstation/tgstation#39044 - Fixes burgers icons

* tgstation/tgstation#39055 - Fixes porta_turret and decal shuttle rotations

* tgstation/tgstation#39063 - Stops extinguishers from cooling turfs to absolute zero

* tgstation/tgstation#38967 - Fixes smuggler's satchel init typo

* tgstation/tgstation#38931 - Fixes pulse rifles exploding structures in nullspace and that sort of thing
 2018-07-20 03:40:39 -07:00
kevinz000
9547bed028 Update all_nodes.dm 2018-07-20 03:30:38 -07:00
deathride58
f9e7b491ae Merge pull request #7370 from Citadel-Station-13/kevinz000-patch-3 
gives AI smartfridge interaction why not we already caved and let them fuck wtih vending machines
 2018-07-18 18:07:10 -04:00
deathride58
a18525ad06 Merge pull request #7366 from Citadel-Station-13/mirror-38933 
[requires testmerge]upstream mirror - projectile pathing/hitscan lighting refactor
 2018-07-17 11:19:07 -04:00
kevinz000
6b1dbf8561 Update flash.dm 2018-07-16 15:33:53 -07:00
deathride58
0fb43d5c4b Merge pull request #7364 from Citadel-Station-13/kevinz000-patch-1 
flightsuit speed rebalancing
 2018-07-15 17:52:26 -04:00
kevinz000
0e13b3b1c6 Update smartfridge.dm 2018-07-14 23:44:52 -07:00
kevinz000
b33d2b82fb Merge branch 'master' into mirror-38933 2018-07-14 15:26:49 -07:00
kevinz000
bcb1b04c40 Upstream mirror 2018-07-14 15:24:35 -07:00
kevinz000
b8b495ba42 Update species.dm 2018-07-12 09:38:31 -07:00
Bear
88fb190bed display images modularizing 2018-07-10 18:05:16 -04:00
Bear
4f48bc2dd5 pAI screen displays 2018-07-10 07:37:16 -04:00
Bear
82f513d204 holochassis options 2018-07-10 07:10:15 -04:00
deathride58
914967f081 Merge pull request #7356 from Trilbyspaceclone/WT-550 
Hopefully this will add in the missing WT-550 Toxin Ammo for sec
 2018-07-10 02:03:08 -04:00
deathride58
0235f37fd0 Merge pull request #7339 from Trilbyspaceclone/patch-3 
Adds more to the Autodrobe coin slot!
 2018-07-10 02:00:06 -04:00
deathride58
4f5eb02cca Merge pull request #7338 from Citadel-Station-13/upstream-merge-38649 
[MIRROR] Converts antimagic from GetComponent to a signal
 2018-07-10 01:59:14 -04:00
deathride58
21b6c7986b Merge pull request #7193 from Citadel-Station-13/kevinz000-patch-13 
Cyborgs now drop their encryption keys on detonation/deconstruction
 2018-07-10 01:58:59 -04:00
deathride58
78241f4237 Merge pull request #7351 from Citadel-Station-13/upstream-merge-38930 
[MIRROR] Cleans up other components destroys
 2018-07-10 01:58:36 -04:00
deathride58
d904b54e7c Merge pull request #7350 from Citadel-Station-13/upstream-merge-38929 
[MIRROR] Fixes animals trying to break map border
 2018-07-10 01:58:19 -04:00
deathride58
bf89d077ba Merge pull request #7349 from Citadel-Station-13/upstream-merge-38932 
[MIRROR] Disables knockdown/throw on supply shuttle docking
 2018-07-10 01:58:02 -04:00
deathride58
8025ba5a1f Merge pull request #7348 from Citadel-Station-13/upstream-merge-38935 
[MIRROR] minor turf reservation fix - no longer reserves 1 more height+width than necessary, checks against invalid sizes
 2018-07-10 01:57:46 -04:00
deathride58
03f3c6b993 Merge pull request #7346 from Citadel-Station-13/upstream-merge-38927 
[MIRROR] Improves cargo shuttle/firefighting foam descs
 2018-07-10 01:57:30 -04:00
deathride58
4cdd3bbaa1 Merge pull request #7352 from Citadel-Station-13/upstream-merge-38931 
[MIRROR] Fixes pulse rifles exploding structures in nullspace and that sort of thing
 2018-07-10 01:57:08 -04:00
TrilbySpaceClone
ffc5c6935a Lets see If I did this correct this time! 2018-07-06 18:01:29 -04:00