c4480afc09
Adds a bunch of RP clothes and ports the detvendor
2020-09-30 20:50:00 -05:00
9a9e76664f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
2020-05-30 22:47:13 +02:00
f95222fee0
For the stranger there among them had a big iron on his hip. Big iron on his hiiiiiiip. ( #12155 )
...
* HoS modular revolver, ported from vore
* Bugfixing, sanity checks etc.
* Update hos.dm
* Sprite fixed
* Automatic changelog compile [ci skip]
* HoS Weapon Selection
* Icons
* Clamp fix, removing rogue items from ye olde list
* Update ammo.dmi
* Requested Changes Part 1
* Beacon fixed (kind of)
* Subtypes fix
* User
* Giving process_chamber a user so that the proc can use to_chat without requiring loc, fixes switching so the gun only switches to the same type when empty
* redundant item
* Adds an examine notice on how to remove the magazine
* Requested Changes
* Icons
Co-authored-by: Changelogs <action@github.com >
2020-05-30 03:17:56 +02:00
30ab79e09e
Porting the twohanded component.
2020-05-17 18:16:53 +02:00
86898cc451
Force pushed updates
2020-03-22 01:43:19 +01:00
8666a36b1e
fixes most things
2020-02-18 02:24:31 -07:00
d7949e810e
Merge remote-tracking branch 'citadel/master' into staves
2020-02-18 02:20:58 -07:00
bbedf617f5
Declutters the Locker
2020-02-11 17:33:18 -05:00
8556bcf2b3
compile
2020-02-03 13:36:10 -07:00
3e30c9409b
riot staves
2020-02-03 13:11:26 -07:00
d709edb1c2
Merge pull request #10578 from r4d6/Mining
...
Port TG's Mining changes
2020-01-18 20:32:14 +01:00
ce16c91b2f
Code changes
2020-01-16 14:08:14 -05:00
9dad810edf
Merge branch 'Ghommie-cit492' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit492
2020-01-12 23:11:02 +01:00
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
16a37e2769
Standardises all files from CRLF to LF
2020-01-12 14:28:01 +00:00
1a834edd5f
f
2020-01-05 21:27:04 +01:00
ffa013af6e
Minor captains closet cleanup.
2019-12-25 03:59:21 +01:00
3f0d1e275e
Made wooden cabinet/closets... actually made of wood.
2019-12-04 18:27:17 +01:00
4e20f576e6
Merge branch 'master' into xantholne-berets02
2019-11-25 20:16:15 -07:00
71b3b8fdc6
Ports/Adds new Berets
...
Ports some berets adds even more to most jobs
2019-11-20 22:21:20 -07:00
b146fd14f3
actually adds the winter coats
2019-11-16 18:25:05 +08:00
8563af71b3
Update security.dm
2019-07-25 21:43:02 -04:00
612021b9d5
h
2019-07-25 21:43:02 -04:00
7706ec6329
I LOVE THE SMELL OF NAPALM IN THE MORNING!
2019-06-09 02:45:14 +02:00
644a5a1e66
Berettide!
2019-04-06 22:52:26 +02:00
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
2a6e4fce59
Photography Update
2018-07-20 15:26:13 -07:00
ac6fddcfb3
Merge remote-tracking branch 'upstream/master' into hopefullythefinalhardsync
2018-07-05 00:17:44 -04:00
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
91805b8789
and that just leaves the modules folder
2018-07-02 00:28:51 -04:00
3369c804b2
Kills off /obj/item/device ( #6561 )
2018-04-30 00:06:58 -05: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
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
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
315e1d718a
Adds pet carriers
2017-12-08 10:34:05 -06:00
f089b9ca2d
Removes mass-spectrometers
2017-11-28 06:27:55 -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
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
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
Detective Google