shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
18,212 Commits 5 Branches 0 Tags
438daa7acffbb34bc26db4485a8d2c81efcb31ce
Commit Graph

18212 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
caeb298d82 Merge pull request #7415 from Poojawa/patch-1 
Makes carp edible
 2018-08-04 00:21:33 -04:00
deathride58
2840a3f933 Merge pull request #7416 from Citadel-Station-13/kevinz000-patch-5 
halves hypospray times
 2018-08-04 00:09:05 -04:00
deathride58
d9c751114b Merge pull request #7417 from Citadel-Station-13/kevinz000-patch-6 
doubles hypovial storage
 2018-08-04 00:08:56 -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
deathride58
bbb5c1f6d5 Merge pull request #7432 from Citadel-Station-13/quickfix002 
Icon Fix
 2018-08-04 00:08:00 -04:00
deathride58
5faf02a4b2 Merge pull request #7419 from Citadel-Station-13/kevinz000-patch-1 
Update shuttles.dm
 2018-08-04 00:05:33 -04:00
nik707
d23f0b23a3 Hopefully working re-merge of #7391 with some other minor tweaks (#7401) 
* [s] Hopefully working re-merge of #7391

* pubby changes 2: electric boogaloo.

* another small fix

* adds missing camera

* extremely critical addition of a jukebox to pubby bar

* fucking missed a disposal pipe kill me <3

* fixes medbay disposals

* Update .gitignore
 2018-08-03 19:32:19 -07:00
CitadelStationBot
f343814a15 Automatic changelog generation for PR #7360 [ci skip] 2018-08-03 21:30:11 -05: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
CitadelStationBot
047d757bfd Automatic changelog generation for PR #7405 [ci skip] 2018-08-03 21:29:46 -05:00
deathride58
42083d7206 Removes combat rework training wheels, and nerfs myself by increasing the minimum stamloss required to throw a knockout punch with boxing gloves (#7405) 2018-08-03 19:29:44 -07:00
CitadelStationBot
b8529c098f Automatic changelog generation for PR #7368 [ci skip] 2018-08-03 21:29:21 -05:00
deathride58
4208d6ea5f Adds boombox donor item for Raiq/chefferz (#7368) 2018-08-03 19:29:19 -07:00
kevinz000
6353b26822 Update client_procs.dm 2018-08-03 19:26:41 -07:00
LetterJay
a56220634a i have no idea 2018-08-03 19:47:21 -05:00
LetterJay
3d734421d4 Merge pull request #7422 from Citadel-Station-13/m41 
Donation Item - Toy M41
 2018-08-01 12:30:58 -05:00
LetterJay
166e6b66de Update toys.dm 2018-08-01 08:41:10 -05:00
LetterJay
77b3c46dbf moves some stuff around 2018-08-01 08:07:56 -05:00
LetterJay
ce4da89cf1 Update custom_items.dm 2018-08-01 07:32:16 -05:00
LetterJay
7293bf85b5 Update custom_items.dm 2018-08-01 07:22:41 -05:00
LetterJay
e475970385 donate 2018-07-30 09:23:12 -05:00
CitadelStationBot
17f06747ac Automatic changelog generation for PR #7409 [ci skip] 2018-07-30 01:29:27 -05:00
slate
6337fb77ec ports 3 new borg sprites from rp's codebase to main's. (#7409) 
engineering gets a new mr. handy sprite
medical gets a new eyebot sprite
security gets a new spider-tank sprite
 2018-07-29 23:29:25 -07:00
kevinz000
8b7fa2396b Update shuttles.dm 2018-07-29 17:04:55 -07:00
deathride58
4eec300170 Merge pull request #7413 from Citadel-Station-13/zozzle 
Icon fix
 2018-07-28 09:20:24 -04: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
deathride58
abd4ca17b2 Merge pull request #7410 from Citadel-Station-13/kevinz000-patch-2 
fixes the reason I and a lot of you lock up for more than half a minute when trying to join the server
 2018-07-28 09:13:34 -04:00
kevinz000
349eb64e53 Update hypovial.dm 2018-07-28 03:11:01 -07:00
kevinz000
b35ea6b472 Update hypospraymkii.dm 2018-07-28 03:09:58 -07:00
Poojawa
d156b50331 Makes carp edible 
Because apparently this was never modularized correctly.
 2018-07-28 01:53:37 -05:00
LetterJay
6722d9a20f yea 2018-07-27 09:03:03 -05:00
kevinz000
9325319da1 Update special.dm 2018-07-26 16:44:08 -07:00
kevinz000
03843f1b20 Update asset_cache.dm 2018-07-26 00:43:52 -07:00
LetterJay
44f8c3b0fb Merge pull request #7408 from Citadel-Station-13/NoMoreW 
Removes the W
 2018-07-25 23:56:32 -05:00
LetterJay
fc21ee9f36 REMOVE 2018-07-25 22:12:34 -05:00
LetterJay
3c6b63f899 Merge pull request #7406 from Citadel-Station-13/anotherfix 
Fix/Changes for Donator item
 2018-07-25 07:08:45 -05:00
LetterJay
42cb534ad0 sprite/desc change 2018-07-25 06:38:54 -05:00
deathride58
00473c4b75 Merge pull request #7382 from Citadel-Station-13/kevinz000-patch-2 
nerfs telebatons some more because i accidently buffed them to be more op than infinite cell stunbatons
 2018-07-24 10:31:36 -04:00
deathride58
bc9cc90fb4 Merge pull request #7403 from Citadel-Station-13/quickfix 
Icon Fix
 2018-07-24 10:29:17 -04:00
kevinz000
5ccda57266 Update wormhole.dm 2018-07-24 01:06:37 -07:00
LetterJay
dbe376d751 bad names/var 2018-07-23 07:52:13 -05:00
LetterJay
d7780aa300 Merge pull request #7398 from Citadel-Station-13/luckyjack 
Donator - Lucky Jack Boots
 2018-07-22 21:33:21 -05:00
LetterJay
82027db961 thing 2018-07-22 00:07:22 -05:00
deathride58
c5ea93cb08 Merge pull request #7396 from Cw3040/revert-7391-nicc's-map-changes 
Revert "reopens corridor between chem and rnd" because issues
 2018-07-22 00:25:24 -04:00
Cw 3040
051735f245 Revert "reopens corridor between chem and rnd (#7391)" 
This reverts commit 45ce574513.
 2018-07-21 23:53:00 -04:00
nik707
45ce574513 reopens corridor between chem and rnd (#7391) 
* pubbystationv1

This is a relatively minor change that reopens the central corridor between RND and Chemistry, each losing a negligable amount of space as a result. Will make navigating pubby a bit easier.

* removed mention of step_x
 2018-07-21 18:32:26 -07:00
Letter N
dfb5837784 dhonk: not a conflict edition (#7389) 
* Add files via upload

* help, goon lawyers are here

they got me, MAINT NEAR SCIENCE
 2018-07-21 12:57:09 -07:00
kevinz000
e29016b257 Update wormhole.dm 2018-07-21 02:17:54 -07:00