Commit Graph
18416 Commits
Author SHA1 Message Date
LetterJay a56220634a i have no idea 2018-08-03 19:47:21 -05:00
kevinz000andGitHub 0ee8542677 Update toolbox.dm 2018-08-01 21:27:43 -07:00
kevinz000andGitHub ff8f5046f9 Update misc.dm 2018-08-01 21:24:03 -07:00
nik707 abd40802aa fixes medbay disposals 2018-08-01 19:45:56 -05:00
kevinz000andGitHub 850eb21df9 Update robot_modules.dm 2018-08-01 16:43:47 -07:00
LetterJayandGitHub 3d734421d4 Merge pull request #7422 from Citadel-Station-13/m41
Donation Item - Toy M41
2018-08-01 12:30:58 -05:00
LetterJayandGitHub 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
LetterJayandGitHub ce4da89cf1 Update custom_items.dm 2018-08-01 07:32:16 -05:00
LetterJayandGitHub 7293bf85b5 Update custom_items.dm 2018-08-01 07:22:41 -05:00
nik707 70fc9ce348 fucking missed a disposal pipe kill me <3 2018-07-31 14:32:32 -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
slateandkevinz000 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
kevinz000andGitHub 7147d23c00 Update hypovial.dm 2018-07-29 17:10:33 -07:00
kevinz000andGitHub 8b7fa2396b Update shuttles.dm 2018-07-29 17:04:55 -07:00
nik707 afa8003451 extremely critical addition of a jukebox to pubby bar 2018-07-29 12:20:10 -05:00
deathride58andGitHub 4eec300170 Merge pull request #7413 from Citadel-Station-13/zozzle
Icon fix
2018-07-28 09:20:24 -04:00
deathride58andGitHub 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
deathride58andGitHub 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
deathride58andGitHub 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
kevinz000andGitHub 349eb64e53 Update hypovial.dm 2018-07-28 03:11:01 -07:00
kevinz000andGitHub b35ea6b472 Update hypospraymkii.dm 2018-07-28 03:09:58 -07:00
PoojawaandGitHub 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
kevinz000andGitHub 9325319da1 Update special.dm 2018-07-26 16:44:08 -07:00
nik707 60ed121a58 adds missing camera 2018-07-26 14:19:14 -05:00
kevinz000 5b76760b29 Ports virgo hairstyles 2018-07-26 03:51:09 -07:00
kevinz000andGitHub 03843f1b20 Update asset_cache.dm 2018-07-26 00:43:52 -07:00
LetterJayandGitHub 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
nik707 698727e18a adds a seemingly missing light to a dark corner in engineering 2018-07-25 19:38:18 -05:00
nik707 d41dd29a0d Revert "readds missing light in engineering"
This reverts commit 6b7a0f5eab.
2018-07-25 19:32:54 -05:00
nik707 6b7a0f5eab readds missing light in engineering 2018-07-25 19:31:48 -05:00
LetterJayandGitHub 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
deathride58andGitHub 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
deathride58andGitHub 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
nik707 db7465910e another small fix 2018-07-23 18:44:44 -05:00
nik707 ae6d1b623a pubby changes 2: electric boogaloo. 2018-07-23 14:39:09 -05:00
LetterJay dbe376d751 bad names/var 2018-07-23 07:52:13 -05:00
LetterJayandGitHub d7780aa300 Merge pull request #7398 from Citadel-Station-13/luckyjack
Donator - Lucky Jack Boots
2018-07-22 21:33:21 -05:00
kevinz000andGitHub 70bdea81ec Update world.dm 2018-07-22 16:46:52 -07:00
nik707 31424150a6 [s] Hopefully working re-merge of #7391 2018-07-22 16:36:30 -05:00
LetterJay 82027db961 thing 2018-07-22 00:07:22 -05:00
deathride58andGitHub 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 3040andGitHub 051735f245 Revert "reopens corridor between chem and rnd (#7391)"
This reverts commit 45ce574513.
2018-07-21 23:53:00 -04:00
nik707andkevinz000 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
kevinz000andGitHub 22069cd841 Update album.dm 2018-07-21 13:23:02 -07:00