e52e52fa5d
Removes the old hypospray from CMO closet, updates tator objective
2018-03-21 20:37:29 -05:00
6c7da493d9
Reee mirror bot. Hard syncs some missed PR stuff + maps ( #5951 )
...
* maps and tgui
* missed defines and helpsers
* controller things
* datums
* game folder stuff
* module things
* icons
* stragglers
* map sync and updating
wew lad
2018-03-14 16:49:40 -05:00
a62aa577f1
Merge pull request #5854 from Citadel-Station-13/upstream-merge-36055
...
[MIRROR] Techwebs update: Protolathe/Circuit imprinters combined into techfabs!
2018-03-09 19:25:12 +00:00
91ac70a73e
RND TECHWEBS: TECHFABS ( #36055 )
...
Doing my little update piece by piece because I'm lazy and because storage PR is going to conflict everything ever.
Techfabs do not link to RND consoles, and have their own interface for producing things.
RND production machinery code refactored.
Techwebs have categories views instead of just a goddamn design list.
Old machinery will be kept in, as some places will keep them. Read: Engineering, robotics, etc.
experimental: Protolathes and circuit imprinters combined/changed to techfabs. All departments can now print related circuit boards. Engineering and science will keep their lathe/imprinter design by default at roundstart because they have specialized labs for those.
2018-03-07 21:11:56 -06:00
95cb6b23f2
controllers, datums, game
2018-03-06 21:16:46 -06:00
0b42003f53
Merge branch 'master' into QM-as-Head
2018-02-18 03:46:35 +00:00
f9353da855
Quote the armor lists
2018-02-16 00:26:26 -06:00
a1116f6dc8
QM is now a Head of Staff, everyone rejoice
2018-02-12 01:52:33 +00:00
92212cdcb6
[MIRROR] Moves the spare ID inside the captain's locker ( #5291 )
...
* Moves the spare ID inside the captain's locker (#35219 )
* Places captain's spare inside the locker
* Removes captain's spare from the map
* Added a missing (src)
* Moves the spare ID inside the captain's locker
2018-02-05 05:36:09 -06:00
f8b030f18f
Can't trust people not to cause problems.
2018-02-04 19:11:10 -06:00
40c98ad9ff
adds sickshot to the same lockers as defibs
2018-02-03 10:40:42 -06:00
fb5de29784
cleanup of game folder, other fixes
2018-01-31 06:39:18 -06:00
8e090b430b
Adds the Bluespace Drop Pod upgrade to the cargo express console
2018-01-23 01:36:43 -06:00
5e58abca3a
Merge pull request #34551 from MrDoomBringer/DropItLikeItsHottest
...
fixes supply drop pods being impossible to dissassemble
2018-01-19 09:43:21 -06:00
a5a1838bcb
Rocket Pods now require manual disassembly ( #34374 )
...
Bluespacing out simply wasn't metal enough tbh
2018-01-14 21:59:20 -06:00
1f88c0c660
[READY]Cargo Update: Nanotrasen Supply Drop Pods!
2018-01-10 03:12:07 -06:00
d8facb3bce
initial commit - game folder + maps + dme
2018-01-03 22:52:38 -05:00
7af461539f
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
2017-12-16 13:08:50 -06:00
253c819bc1
TG Sync 12/15/17
...
s
s
2017-12-15 06:27:57 -08:00
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
bc4b689d56
Update medical.dm
2017-12-08 12:23:03 -05:00
315e1d718a
Adds pet carriers
2017-12-08 10:34:05 -06:00
f089b9ca2d
Removes mass-spectrometers
2017-11-28 06:27:55 -06:00
12aa356f10
Updates some item drops to use drop_location()
2017-11-24 12:59:33 -06:00
6446b7f126
Security Skirts and more!
2017-11-04 10:22:45 +08:00
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
1fe4eb7d88
Merge pull request #3508 from Michiyamenotehifunana/recolorable-guns
...
Recolorable Guns and more ballistics for Security
2017-10-29 23:43:20 -04:00
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
25c37ac9bb
Removes crewpinpointer from wardens locker ( #31711 )
...
* Update security.dm
* Update security.dm
2017-10-19 02:02:25 -05:00
4b17b4a9a3
Adds petcollars to the cmo, captain, and bartender's locker
2017-10-14 18:01:05 -05:00
b9967e6453
Update medical.dm
2017-10-03 18:48:43 -05:00
1782fbeed7
Adds the advanced medical scanner, gives one to the CMO
2017-10-03 18:16:29 -05:00
f3ae038f6c
Update cargo.dm
2017-10-01 15:35:27 -05:00
3a83b28bae
Adds the Cargo-Tech-of-the-Shift award
2017-10-01 09:43:20 -05:00
ac8e74e517
Update freezer.dm
2017-09-24 08:35:36 -05:00
60bdb54024
You can now Indiana Jones one explosion.
2017-09-23 23:34:04 -05:00
16c7706618
Merge branch 'master' into upstream-merge-30117
2017-09-11 18:10:15 -05:00
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
50b88388da
Crew monitoring rework part 1: crew pinpointers
2017-08-30 17:03:20 -05:00
188193eb61
here we go again ( #2456 )
2017-08-24 19:24:25 -07:00
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
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
91a2d1ca0b
Update security.dm
2017-07-19 04:57:45 -05:00
609ae007ae
Changes all access const to be a define
2017-07-16 11:44:47 -05:00
b3f8b2a2d7
Adds a "synthesizer" that's basically a handheld piano
2017-07-13 17:46:46 -05:00
ff6bbbedf5
Changes some 1s and 0s to TRUE and FALSE ( #1967 )
2017-07-10 16:13:16 -07:00
90c2a4f867
Removes now-unnecessary obj_integrity definitions
2017-07-09 19:44:48 -05:00
b1b4826c0c
July 5th TG sync ( #1883 )
...
July 5th TG sync
2017-07-05 22:14:19 -05:00
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
0c2bf7e5ea
Station Engineers Spawn With Industrial Welder
2017-06-25 09:17:52 -05:00
Poojawa