2426849d4b
this is a pretty bad idea
2019-10-22 02:19:33 -07:00
2742c86723
Merge pull request #9072 from Poojawa/gen-poppers
...
Genpop for security
2019-10-21 21:15:01 -04:00
a6acb212fa
Merge pull request #9515 from Ghommie/Ghommie-cit241
...
Porting "Moves machine/computer frames and structures below object layer." and lowering trays layer.
2019-10-17 17:29:18 -07:00
f3a9cac11e
Porting "Moves machine/computer frames and structures below object layer." and lowering trays layer.
2019-10-16 23:39:21 +02:00
7b2c8e58ff
Fixes freezing and ghost rider
2019-10-14 13:23:39 +01:00
587568bf88
Merge branch 'master' into tg-Organ-port
2019-09-19 01:33:15 +01:00
c23d6f0113
I missed an earlier port.
2019-09-17 01:08:37 +01:00
fa364bbad0
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into gen-poppers
2019-09-13 13:00:29 -05:00
64b757f404
refactor suits
2019-09-07 17:10:10 -05:00
09ed526594
Merge pull request #9089 from Sishen1542/rapid-construction-dabvice
...
RCDs can be upgraded to create computer/machine frames, moved deconstruction to the upgrade tier
2019-09-07 11:35:09 -07:00
24fe7126c4
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28
2019-08-24 19:05:51 +02:00
3281f23eb6
made changes as per bhijns request
2019-08-14 16:30:54 -04:00
b5841c718b
Genpop for security
2019-08-07 06:14:35 -05:00
7391581a26
2 small fixes.
2019-08-07 11:33:53 +01:00
2a049e3485
Should fix the locker conflict! (untested)
2019-08-07 09:40:13 +01:00
2256bbb63c
Merge branch 'master' into master
2019-08-07 09:30:53 +01:00
decbd37ced
Update closets.dm
2019-08-06 03:49:08 -04:00
5795f6bbe2
Merge branch 'master' into master
2019-08-05 09:09:36 +01:00
1f100f1f3b
crush my lock with a rock i must
2019-08-03 18:48:14 -04:00
d080446a77
Merge branch 'pr/20'
2019-07-28 23:28:19 +01:00
68083aa0c6
a
2019-07-25 21:43:02 -04:00
8563af71b3
Update security.dm
2019-07-25 21:43:02 -04:00
612021b9d5
h
2019-07-25 21:43:02 -04:00
123c9199ba
Added Eigenlockers. I love them.
2019-07-25 20:51:09 +01:00
589cdae0e1
Towels
2019-07-18 00:03:49 +02:00
1e1f8e627f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28
2019-07-15 17:33:41 +02:00
a3a2fb03b6
My bad, my bad.
2019-07-14 14:21:28 +02:00
129ca9d71f
Ports "Refactors NODROP flag into TRAIT_NODROP"
2019-07-13 10:27:39 +02:00
d5279c8373
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28
2019-06-17 09:51:22 +02:00
c3fa360270
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit43
2019-06-09 04:50:10 +02:00
7706ec6329
I LOVE THE SMELL OF NAPALM IN THE MORNING!
2019-06-09 02:45:14 +02:00
d3d2b8d898
should be ready.
2019-06-06 19:24:20 +02:00
0513f3464a
one
2019-06-05 19:20:25 +02:00
81fde9c7a6
Forgot to add the CE beret to the CE locker.
2019-04-06 23:34:10 +02:00
644a5a1e66
Berettide!
2019-04-06 22:52:26 +02:00
7a2088aba6
Adds usefull tools/healing items to utility lockers - Requested by LeonDuvall ( #7974 )
...
* Update utility_closets.dm
* Update firstaid.dm
* Update pill.dm
* Update hypospray.dm
* Update firstaid.dm
* Update pill.dm
2019-02-13 20:46:55 -08:00
ddf833d16c
[Ready] Makes Adv surgery tools more common around the station! ( #7938 )
...
* Fixing updater
* Adds the belt with tools!
* Adds belt to CMO locker
* Synda bag
* Adds the medical bag to uplink
* adds in cargo crate
* Apply suggestions from code review
Rag spelling check a base line item I guess
Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com >
* Apply suggestions from code review
Spell check Rag at it again fixing Trilbys failers
Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com >
2019-02-08 05:26:42 -08:00
4c7075f1a8
New medals added.
...
add: Two new medals for engineering and medical to give out.
2018-12-08 12:12:36 -06:00
1d198a6ea1
Merge pull request #7652 from Michiyamenotehifunana/ToriCrate
...
Resprites all regular crates to 3/4ths ones
2018-10-14 04:45:01 -04:00
f40011a0ce
Resprites all basic crates
2018-10-13 17:43:21 +08:00
a29e30a543
fixes runtimes
2018-10-12 05:55:50 -05:00
d231018a3a
Flashy flash and Gondola Pods
...
and cult effect addition, fixes CTF
2018-09-21 02:48:17 -05:00
7d300117af
literally everything Bhjin has been complaining about
...
also modularizes stuff and adds more comments. Like responsible downstream repos should have.
2018-09-18 03:59:46 -05:00
1a2460ed28
Continous update intergration until being merged
...
Also tgui fixes/updates
2018-09-15 00:37:29 -05:00
22e2990ee7
//USE THIS TO FILL IT, NOT INITIALIZE OR NEW
2018-09-14 07:47:13 -05:00
8b9ef1e400
Game folder
2018-09-11 04:06:45 -05:00
b604390f33
Ports tgstation/tgstation#39302 with adjustments, see desc of commit ( #7424 )
...
Instead of the box being 100% invisible at all times, the box will steadily become more and more visible as you move. The faster you move, the more visible the box becomes. The box will slowly become invisible again every process() cycle.
This also makes the box inherit the movement delay of it's user, meaning you're able to sprint while moving inside boxes, or walk to slow yourself down.
2018-09-07 05:40:53 -07: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
6670284b62
fixes items spawning on top of closets rather than inside closets ( #7361 )
2018-07-20 03:41:34 -07:00
kevinz000