ea36d5944e
More radiation balance changes and fixes ( #32051 )
...
* more balance changes and fixes
* cleanup
2017-10-27 03:08:03 -05:00
20bbd77f73
Merge pull request #3549 from Citadel-Station-13/upstream-merge-31974
...
[MIRROR] Biosuits now offer high Rad resistance
2017-10-23 03:44:18 -04:00
04b3a18502
Biosuits now offer high Rad resistance ( #31974 )
...
* Biosuit rad resistance buff
* Buffed medical hardsuit rad resist
2017-10-21 23:16:18 -05:00
d0789ecaf9
Splits clothing.dm in 7 other files
2017-10-21 19:01:30 -05:00
d25cb1ba5d
[MIRROR] Grammar fixes to atom descriptions ( #3165 )
...
* Grammar fixes to atom descriptions
* compile errors
2017-10-21 07:17:03 -05:00
742669cc62
Restores security bombsuit & white bombsuit
2017-10-15 11:33:42 -05:00
d6903bcf3c
Merge branch 'master' into upstream-merge-31601
2017-10-14 10:17:16 -04:00
bd7a0d65b5
Fix many instances of "the the"
2017-10-13 09:41:54 -05:00
55e8f6526c
Radiation rework and subsystem
2017-10-13 09:22:23 -05:00
4bc6e9d522
[MIRROR] Cleaned up some decimal values. ( #2797 )
...
* Cleaned up some decimal values.
* Update gas_mixture.dm
* Update color.dm
* Update medsci.dm
2017-09-18 01:45:39 -05:00
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
dac6cc56e4
Merge branch 'master' into upstream-merge-30494
2017-09-12 02:40:24 -05:00
63122795f9
Adds missing span-endings
2017-09-11 07:10:09 -05:00
f63a75b137
Egyptian Clothing, Egyptian Null Rod, Craftable Mummy Costume!
2017-09-10 17:08:36 -05:00
b6eddd8845
ok
2017-09-07 10:34:36 -05:00
6c76ae2395
clean up
2017-08-28 10:34:31 -05:00
188193eb61
here we go again ( #2456 )
2017-08-24 19:24:25 -07:00
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
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
b01a24c95b
my eyes hurt
2017-08-22 01:42:20 -05:00
87b3df3069
Replace all secondary flags with bitflags stored in the flags_2 var
2017-08-17 09:19:14 -05:00
cdbaf5c4e8
Standardized CENTCOM spelling
2017-08-08 09:05:44 -05: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
55f1de10a6
Spellchecking
2017-08-01 08:46:20 -05:00
bdcc4bc429
Update miscellaneous.dm
2017-07-30 23:33:58 -05:00
a72962c300
Made some object lists less terrible to read
2017-07-18 09:44:43 -05:00
bbc28aa856
Energy swords and other transforming energy weapons are now subtypes of transforming weapons ( #2049 )
2017-07-17 22:51:51 -07:00
b2c8115ca5
Winter coats now properly hold flashlights ( #2043 )
2017-07-17 22:51:14 -07: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
d4c54bb0b5
Ancient Space Station [Space Spawn Ruin]
2017-06-25 11:03:27 -05:00
989b991b05
Adds framework for equip delays and adds it to the straight jacket
2017-06-19 22:06:18 -05:00
813bcc2b8d
commit
2017-06-14 11:16:54 -05:00
35b56f3075
Merge branch 'master' into upstream-merge-27773
2017-06-06 09:05:26 -05:00
159f78efe7
Fixes #27989 : Riot suits no longer hide jumpsuits ( #1379 )
2017-06-04 09:09:03 -07:00
afbfb66386
Splits mining_mobs.dm into separate files
2017-05-29 01:17:13 -05:00
2cc74f4a8f
Changes incorporeal movement to use defines
2017-05-27 20:55:04 -05:00
a84bcdd42e
Adds goliath cloak & a recipe (Lavaland PvE primitive item)
2017-05-26 11:14:20 -05:00
074b684b4d
Armour Description Changes
2017-05-24 00:11:57 -05:00
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
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
5b2521dad4
Tweaks the curator's access and clothing to improve his treasure hunting ability ( #882 )
2017-05-10 16:05:33 -07:00
6310292531
woo
2017-05-02 11:19:14 -05:00
2bef665038
Merge pull request #613 from Citadel-Station-13/upstream-merge-26563
...
[MIRROR] Renames generic armor and athletic shorts
2017-05-02 11:14:47 -05:00
ed7a4f57b5
>unironically spelling unironically wrong
2017-04-28 10:02:16 -05:00
caaf42815a
Changes some << to to_chat
2017-04-28 06:14:47 -05:00
4a2e1367b5
Renames generic armor and athletic shorts
2017-04-27 17:01:29 -05:00
a905c15dad
Replaces /image with /mutable_appearance ( #556 )
...
* Replaces /image with /mutable_appearance, where appropriate
* Update miscellaneous.dm
* Delete miscellaneous.dm.rej
* Delete pet.dm.rej
* Update pet.dm
* Update species.dm
* Update miscellaneous.dm
* Update species.dm
* Update miscellaneous.dm
* Delete species.dm.rej
* Update species.dm
pretty sure I got all the indentation correct THIS time, ffs
* Update species.dm
* Update species.dm
fucking tabs man, fucking tabs.
2017-04-26 08:18:35 -05:00
387caa518f
Changed alternate appearances to /datum/atom_hud s
2017-04-23 13:26:08 -05:00
Emmett Gaines