ShadeAware
bbedf617f5
Declutters the Locker
2020-02-11 17:33:18 -05:00
Ghom
d709edb1c2
Merge pull request #10578 from r4d6/Mining
...
Port TG's Mining changes
2020-01-18 20:32:14 +01:00
r4d6
ce16c91b2f
Code changes
2020-01-16 14:08:14 -05:00
Ghommie
9dad810edf
Merge branch 'Ghommie-cit492' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit492
2020-01-12 23:11:02 +01:00
Ghommie
b2ab8959f6
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit492
2020-01-12 23:00:05 +01:00
AffectedArc07
16a37e2769
Standardises all files from CRLF to LF
2020-01-12 14:28:01 +00:00
Ghom
1a834edd5f
f
2020-01-05 21:27:04 +01:00
Ghommie
ffa013af6e
Minor captains closet cleanup.
2019-12-25 03:59:21 +01:00
Ghommie
3f0d1e275e
Made wooden cabinet/closets... actually made of wood.
2019-12-04 18:27:17 +01:00
Unknown
4e20f576e6
Merge branch 'master' into xantholne-berets02
2019-11-25 20:16:15 -07:00
Unknown
71b3b8fdc6
Ports/Adds new Berets
...
Ports some berets adds even more to most jobs
2019-11-20 22:21:20 -07:00
Seris02
b146fd14f3
actually adds the winter coats
2019-11-16 18:25:05 +08:00
Sishen
8563af71b3
Update security.dm
2019-07-25 21:43:02 -04:00
Sishen
612021b9d5
h
2019-07-25 21:43:02 -04:00
Ghommie
7706ec6329
I LOVE THE SMELL OF NAPALM IN THE MORNING!
2019-06-09 02:45:14 +02:00
Cyprian
644a5a1e66
Berettide!
2019-04-06 22:52:26 +02:00
Tupinambis
afcf52f5d8
This time it should actually work. I forgot to compile the first because I am an idiot haha yes.
2018-08-31 18:05:10 -05:00
kevinz000
2a6e4fce59
Photography Update
2018-07-20 15:26:13 -07:00
deathride58
ac6fddcfb3
Merge remote-tracking branch 'upstream/master' into hopefullythefinalhardsync
2018-07-05 00:17:44 -04:00
Letter N
abc32ed0df
adds "cap's female formal outfit" ( #7307 )
...
* Update under.dm
* modifies cit_clothes.dmi
* Updates uniforms.dmi
* Update security.dm
* now wont remove other clothing stuff (TM)
* Add files via upload
* Update under.dm
2018-07-04 05:37:01 -07:00
deathride58
91805b8789
and that just leaves the modules folder
2018-07-02 00:28:51 -04:00
kevinz000
3369c804b2
Kills off /obj/item/device ( #6561 )
2018-04-30 00:06:58 -05:00
kevinz000
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
CitadelStationBot
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
deathride58
d8facb3bce
initial commit - game folder + maps + dme
2018-01-03 22:52:38 -05:00
LetterJay
7af461539f
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
2017-12-16 13:08:50 -06:00
kevinz000
253c819bc1
TG Sync 12/15/17
...
s
s
2017-12-15 06:27:57 -08: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
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
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
jughu
4b17b4a9a3
Adds petcollars to the cmo, captain, and bartender's locker
2017-10-14 18:01:05 -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
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
91a2d1ca0b
Update security.dm
2017-07-19 04:57:45 -05:00
CitadelStationBot
609ae007ae
Changes all access const to be a define
2017-07-16 11:44:47 -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
d04001c09d
another huge sync
2017-06-21 18:00:00 -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
522b6d917f
updates
2017-06-10 09:36:39 -05:00
