oranges
8c1c9f5cd7
Merge pull request #34161 from ShizCalev/bot_sssembly
...
Consolidates bot assemblies under one parent, fixes bot parts switching types when the bot is destroyed
2018-01-13 04:23:03 -06:00
deathride58
0dbc2241ea
modules: A to C
2018-01-04 00:46:53 -05:00
oranges
269208f687
[READY]Component Forensics and Item Blood OverlayS!
2017-12-27 15:19:14 -06:00
vuonojenmustaturska
fcceb5ec77
Finishes the forceMove port
2017-12-14 15:40:08 -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
oranges
1068b8f22d
Merge pull request #32456 from vuonojenmustaturska/ghostmemes
...
[s] Removes a handful of ways ghosts can affect the world
2017-11-06 21:48:42 -06:00
Jordan Brown
d0789ecaf9
Splits clothing.dm in 7 other files
2017-10-21 19:01:30 -05:00
CitadelStationBot
d25cb1ba5d
[MIRROR] Grammar fixes to atom descriptions ( #3165 )
...
* Grammar fixes to atom descriptions
* compile errors
2017-10-21 07:17:03 -05:00
LetterJay
6546804c38
Merge pull request #3159 from Citadel-Station-13/upstream-merge-30525
...
[MIRROR] Adds H.E.C.K. suits, spraycan_paintable component, and reworks item's attackby()
2017-10-06 02:12:06 -04:00
LetterJay
52c57543cb
Update misc_special.dm
2017-10-05 22:43:08 -05:00
XDTM
5b0b2fd5bb
Adds H.E.C.K. suits, spraycan_paintable component, and reworks item's attackby()
2017-10-05 10:53:47 -05:00
AnturK
f45344ed8c
Adds wigs
2017-10-05 09:23:56 -05:00
bawhoppen
82981339ed
Adds desc to things lacking them.
2017-10-01 15:07:37 -05:00
kingofkosmos
f0c684c15e
Alt-clicking descriptions when examining
2017-09-28 21:51:53 -05:00
Poojawa
0eb8cf0235
Icon_override, Plasma weapon tweaks & gunlocker. AK-47 Summoning ( #2759 )
...
* In hands of plasma weapons/tweaks
* Icon override states for all clothes
* a few compile issues ~
* Adds a new badmin button and plasma rifle case
* better cleanup of the sound effect
* Oh, these should've been deleted already.
2017-09-16 04:29:22 -05:00
CitadelStationBot
e4db027692
[MIRROR] Fixes to more Initialize procs ( #2733 )
...
* Fixes to more Initialize procs
* Update ai_monitored.dm
* Update cleanable.dm
* Update instruments.dm
* Update musician.dm
* Update noticeboard.dm
* Update mimic.dm
* Update interactive.dm
2017-09-13 22:54:12 -05:00
Poojawa
3a7cc3df75
re-nerfs cakehat
2017-09-12 23:01:48 -05:00
ExcessiveUseOfCobblestone
f63a75b137
Egyptian Clothing, Egyptian Null Rod, Craftable Mummy Costume!
2017-09-10 17:08:36 -05:00
LetterJay
af409af9cf
additional files
2017-09-05 16:29:25 -05:00
LetterJay
6c76ae2395
clean up
2017-08-28 10:34:31 -05:00
LetterJay
188193eb61
here we go again ( #2456 )
2017-08-24 19:24:25 -07:00
kevinz000
35b7b93b24
ok this is going to be a pain in the ass ain't it ( #2458 )
...
lets hope nothing blows up this time (Flags PR but it works!)
2017-08-22 05:01:38 -07:00
kevinz000
6a309b5996
Revert "[MIRROR] Replace all secondary flags with bitflags stored in the flags_2 var" ( #2457 )
...
ok you know what yeah i think i'll properly mirror https://github.com/Citadel-Station-13/Citadel-Station-13/pull/2411
2017-08-22 04:04:21 -07:00
LetterJay
b01a24c95b
my eyes hurt
2017-08-22 01:42:20 -05:00
CitadelStationBot
87b3df3069
Replace all secondary flags with bitflags stored in the flags_2 var
2017-08-17 09:19:14 -05:00
LetterJay
77025ae8a2
Merge branch 'master' into upstream-merge-29651
2017-08-14 19:37:09 -05:00
LetterJay
9b57f5fd62
Update collectable.dm
2017-08-14 18:39:22 -05:00
LetterJay
46c6a54a75
Update misc.dm
2017-08-14 18:38:55 -05:00
CitadelStationBot
cdbaf5c4e8
Standardized CENTCOM spelling
2017-08-08 09:05:44 -05:00
CitadelStationBot
42fc6497d4
Fixes hair sticking through hats.
2017-08-06 03:13:11 -05:00
CitadelStationBot
55f1de10a6
Spellchecking
2017-08-01 08:46:20 -05:00
CitadelStationBot
64b721ae4f
Halloween Costumes ( #2169 )
2017-07-28 23:51:11 -07:00
LetterJay
dcf957f0b2
adds icons for PDAs by Cecily and the hunter hat ( #2015 )
...
* adds icons for PDAs by Cecily and the hunter hat
* Update cit_hats.dm
2017-07-15 11:44:26 -07:00
CitadelStationBot
ff6bbbedf5
Changes some 1s and 0s to TRUE and FALSE ( #1967 )
2017-07-10 16:13:16 -07:00
Poojawa
b1b4826c0c
July 5th TG sync ( #1883 )
...
July 5th TG sync
2017-07-05 22:14:19 -05:00
CitadelStationBot
d4c54bb0b5
Ancient Space Station [Space Spawn Ruin]
2017-06-25 11:03:27 -05:00
CitadelStationBot
989b991b05
Adds framework for equip delays and adds it to the straight jacket
2017-06-19 22:06:18 -05:00
LetterJay
c877fdb501
Merge branch 'master' into upstream-merge-28046
2017-06-14 13:10:37 -05:00
LetterJay
813bcc2b8d
commit
2017-06-14 11:16:54 -05:00
CitadelStationBot
f03aa5e0fa
Adds some more syndicate equipment.
2017-06-05 13:50:54 -05:00
LetterJay
2d41b7fe17
EHHH
2017-05-28 15:49:22 -05:00
LetterJay
42edd006b8
A BUNCH OF SHIT
2017-05-28 14:57:17 -05:00
LetterJay
fdb54c3ce3
hat
2017-05-27 22:49:20 -05:00
CitadelStationBot
a317d23a51
[MIRROR] Manifest Spirit is better for summoning cannon fodder but slightly worse for instantly summoning Nar-Sie ( #916 )
...
* Manifest Spirit is better for summoning cannon fodder but slightly worse for instantly summoning Nar-Sie
* fixes .rej
2017-05-18 09:37:30 -05:00
CitadelStationBot
8bcaa54cbe
[MIRROR] Fixes language code ignoring holder restrictions ( #858 )
...
* Fixes language code ignoring holder restrictions
* resolve .rej file.
2017-05-18 04:13:57 -05:00
CitadelStationBot
257cf986c5
Repaths C4 ( #808 )
...
* Repaths C4
* Delete tgstation.2.1.3.dmm.rej
* Add files via upload
* update CitadelStation-1.2.1.dmm
2017-05-18 00:37:20 -05:00
LetterJay
a1c04dd314
Merge pull request #898 from LetterJay/master
...
Adds a hunter hat to the game/clothesmate
2017-05-12 16:24:17 -04:00
CitadelStationBot
5b2521dad4
Tweaks the curator's access and clothing to improve his treasure hunting ability ( #882 )
2017-05-10 16:05:33 -07:00
LetterJay
43dd22425b
Citadel hat DMI/DM
...
Cleans up pointless files
2017-05-10 17:33:13 -05:00
