Commit Graph

64 Commits

Author SHA1 Message Date
Mark9013100
a68b5bd3cb Adds extra labcoats to medical wardrobe (#33467) 2017-12-12 14:27:22 -06:00
CitadelStationBot
cc0b768c72 [MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES

* resetting all the maps because we can worry about them later.

* Regexing

* I'm fucked

* Fixes

* .

* maps

* bleh

* ree

* fixes
2017-12-11 16:36:38 -08:00
deathride58
bc4b689d56 Update medical.dm 2017-12-08 12:23:03 -05:00
Ashe Higgs
315e1d718a Adds pet carriers 2017-12-08 10:34:05 -06:00
ACCount
f089b9ca2d Removes mass-spectrometers 2017-11-28 06:27:55 -06:00
ShizCalev
12aa356f10 Updates some item drops to use drop_location() 2017-11-24 12:59:33 -06:00
ShizCalev
6ab499b57b Fixes bartender suit having an adjust state 2017-11-22 12:40:32 -06:00
Jordan Brown
2498e1ddc0 Cleans up unused code 2017-11-20 10:14:32 -06:00
Jordan Brown
248d63fa3a Makes editing movements delay configs have an effect again (#32530) 2017-11-09 11:06:03 -06:00
Michiyamenotehifunana
6446b7f126 Security Skirts and more! 2017-11-04 10:22:45 +08:00
Michiyamenotehifunana
d0a28fcd62 NERF EVERYTHING
EVERYTHING OP NERF NOW also what the fuck how does a whole playerbase ignore balance issues for a whole fucking month only for a vilified member of the community to be so fucking helpful
2017-10-30 15:01:37 +08:00
LetterJay
1fe4eb7d88 Merge pull request #3508 from Michiyamenotehifunana/recolorable-guns
Recolorable Guns and more ballistics for Security
2017-10-29 23:43:20 -04:00
Michiyamenotehifunana
5071b3438c RECOLORABLE GUN MEMES
Includes new ammo types, recolorable guns, partially recolorable guns, non-recolorable guns, and implementations into the map.
2017-10-19 18:30:44 +08:00
jughu
25c37ac9bb Removes crewpinpointer from wardens locker (#31711)
* Update security.dm

* Update security.dm
2017-10-19 02:02:25 -05:00
LetterJay
b5f3dd3445 Update utility_closets.dm 2017-10-15 15:09:37 -05:00
Jordan Brown
742669cc62 Restores security bombsuit & white bombsuit 2017-10-15 11:33:42 -05:00
LetterJay
f68230c93c Update job_closets.dm 2017-10-15 06:58:52 -05:00
jughu
4b17b4a9a3 Adds petcollars to the cmo, captain, and bartender's locker 2017-10-14 18:01:05 -05:00
LetterJay
b9967e6453 Update medical.dm 2017-10-03 18:48:43 -05:00
XDTM
1782fbeed7 Adds the advanced medical scanner, gives one to the CMO 2017-10-03 18:16:29 -05:00
LetterJay
f3ae038f6c Update cargo.dm 2017-10-01 15:35:27 -05:00
Jordan Brown
3a83b28bae Adds the Cargo-Tech-of-the-Shift award 2017-10-01 09:43:20 -05:00
Jordan Brown
e5ef3d2405 Configuration datum refactor 2017-09-28 21:37:53 -05:00
LetterJay
ac8e74e517 Update freezer.dm 2017-09-24 08:35:36 -05:00
Iamgoofball
60bdb54024 You can now Indiana Jones one explosion. 2017-09-23 23:34:04 -05:00
LetterJay
16c7706618 Merge branch 'master' into upstream-merge-30117 2017-09-11 18:10:15 -05:00
CitadelStationBot
5c98b9a13b [MIRROR] Gives the detective a mass spectrometer (#2590)
* Gives the detective a mass spectrometer

* Actually adds it
2017-09-04 04:39:07 -05:00
CitadelStationBot
50b88388da Crew monitoring rework part 1: crew pinpointers 2017-08-30 17:03:20 -05:00
LetterJay
188193eb61 here we go again (#2456) 2017-08-24 19:24:25 -07:00
CitadelStationBot
8a4ddbe8a8 [MIRROR] Ports Rapid Cable Layers from /vg/ and paradise (#2162)
* Ports Rapid Cable Layers from /vg/ and paradise

* rej clean up + manual sync

* maps and .rej file cleanup

* sprite and WGW memes

* actual spellchecked memes

* some other map fix memes

* fuck it, let's just hard sync maps

* dumb paperwork shit for maps

* Revert "dumb paperwork shit for maps"

This reverts commit 8e70bbec0f407c334cd81f5b92aafdb90544ca9d.

* *autistic screeching*

* REEEEEEEEEEEEEEEEEEEEE

* Fuck off I want to do something else
2017-08-02 04:56:44 -05:00
CitadelStationBot
76f7fcef9a [MIRROR] Cleaned up paper varedits + tidied up paths (#2156)
* Cleaned up paper varedits + tidied up paths

* work smarter, not harder

* citadel snowflake

* Update uplink_item_cit.dm
2017-08-02 03:17:32 -05:00
LetterJay
27b826a6f1 Merge pull request #2033 from Citadel-Station-13/upstream-merge-29260
[MIRROR] Changes all access const to be a define
2017-07-19 13:18:58 -05:00
LetterJay
91a2d1ca0b Update security.dm 2017-07-19 04:57:45 -05:00
CitadelStationBot
bbc28aa856 Energy swords and other transforming energy weapons are now subtypes of transforming weapons (#2049) 2017-07-17 22:51:51 -07:00
CitadelStationBot
609ae007ae Changes all access const to be a define 2017-07-16 11:44:47 -05:00
CitadelStationBot
b3f8b2a2d7 Adds a "synthesizer" that's basically a handheld piano 2017-07-13 17:46:46 -05:00
CitadelStationBot
ff6bbbedf5 Changes some 1s and 0s to TRUE and FALSE (#1967) 2017-07-10 16:13:16 -07:00
CitadelStationBot
90c2a4f867 Removes now-unnecessary obj_integrity definitions 2017-07-09 19:44:48 -05:00
Poojawa
b1b4826c0c July 5th TG sync (#1883)
July 5th TG sync
2017-07-05 22:14:19 -05:00
LetterJay
196db74cbe Merge pull request #1714 from Citadel-Station-13/upstream-merge-28588
[MIRROR] Changes to the Atmos Watertank Backpack
2017-06-27 22:59:32 -05:00
CitadelStationBot
0c2bf7e5ea Station Engineers Spawn With Industrial Welder 2017-06-25 09:17:52 -05:00
Matthew
6558f31395 Adding Locker reset function 2017-06-22 23:53:02 -05:00
LetterJay
d04001c09d another huge sync 2017-06-21 18:00:00 -05:00
CitadelStationBot
bac0b96000 Changes to the Atmos Watertank Backpack 2017-06-20 20:49:11 -05:00
LetterJay
a4c9dc43dd Dufflebag => Dufflebag 2017-06-19 16:42:05 -05:00
LetterJay
55d30f865b upstream-merge-28062 2017-06-12 12:20:07 -05:00
LetterJay
b80a184d97 up to upstream-merge-27868 2017-06-11 00:04:00 -05:00
LetterJay
522b6d917f updates 2017-06-10 09:36:39 -05:00
CitadelStationBot
9725329268 A large and unasked for repath and improvement of accessories (formerly ties, but actually armbands and medals) 2017-06-07 03:06:15 -05:00
CitadelStationBot
043d9b478e Gives the janitor a flyswatter in their roundstart equipment (#1354) 2017-06-03 06:37:08 -07:00