3fa561c3b1
fixes spelling and stuff ( #32531 )
2017-11-09 11:04:50 -06:00
ea44e4a1d9
Merge pull request #3857 from Citadel-Station-13/upstream-merge-32489
...
[MIRROR] Global vest lists
2017-11-08 02:21:36 -06:00
5f5f313551
Global vest lists ( #32489 )
...
* Global vest lists
* revised coat
* Fixed duped proc
2017-11-07 23:57:57 -06:00
3253087a0d
Makes flightsuits far more vulnerable to EMPs ( #32430 )
2017-11-07 10:39:42 -06:00
f7c5196954
nerf flight vision ( #32312 )
2017-11-02 04:08:51 -05:00
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
253f1e3f1c
Merge pull request #3379 from Citadel-Station-13/upstream-merge-30570
...
[MIRROR] Flying mobs now clip past non flying mobs, various flightsuit/iontrail/movement tweaks/code improvements/bugfixes
2017-10-14 15:37:17 -04:00
c056349055
Update flightsuit.dm
2017-10-14 13:57:22 -05:00
49ffb814d5
Update flightsuit.dm
2017-10-14 09:23:01 -05:00
77d6420db0
Flying mobs now clip past non flying mobs, various flightsuit/iontrail/movement tweaks/code improvements/bugfixes
2017-10-13 19:09:45 -05:00
55e8f6526c
Radiation rework and subsystem
2017-10-13 09:22:23 -05:00
01ecdff51a
Improve extended examination text for many objects ( #31381 )
...
Plurality, capitalization, punctuation, and item icons have been
improved. Status displays now show the same text on examination that
they do visually. Inducers only show a success message when they
actually succeed.
2017-10-10 03:07:38 -05:00
3232f0a2a0
Update flightsuit.dm
2017-10-09 21:27:59 -05:00
7a0ce217db
Refactors virus spreading
2017-10-09 08:55:57 -05:00
574e166951
Merge pull request #31269 from Firecage/doublehardsuitrebalance
...
Makes the ERT and Chronosuit hardsuits and helmets have the same armor stats.
2017-10-05 03:02:11 -05:00
78f24fae3b
some initial nerfing work
2017-09-23 04:02:03 -05:00
63122795f9
Adds missing span-endings
2017-09-11 07:10:09 -05:00
ca5462adce
triple wew
2017-08-29 09:55:02 -07: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
a0cf777040
Merge branch 'master' into upstream-merge-29940
2017-08-21 23:29:24 -05:00
b5e7f7f7fe
[MIRROR] Adds defines for mouse_opacity ( #2381 )
...
* Adds defines for mouse_opacity
* Delete misc.dm.rej
* Update misc.dm
2017-08-21 20:29:37 -07:00
87b3df3069
Replace all secondary flags with bitflags stored in the flags_2 var
2017-08-17 09:19:14 -05:00
0ffaf66d1f
Merge branch 'master' into upstream-merge-29690
2017-08-15 19:18:22 -05:00
402b9a6cab
Fixes mining hardsuit heat_protection
2017-08-15 05:55:57 -05:00
bd35823012
[ready]Makes bIcon better
2017-08-13 17:41:12 -05:00
cdbaf5c4e8
Standardized CENTCOM spelling
2017-08-08 09:05:44 -05:00
1b22c5fe0c
[MIRROR] Separates actions.dmi into multiple files ( #2214 )
...
* Separates actions.dmi into multiple files
* Delete beam_rifle.dm.rej
* Delete action.dm.rej
2017-08-03 06:09:39 -07: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
79bf3edab9
Update syndi.dm
2017-07-31 02:14:50 -05:00
4f324214c5
Update plasmamen.dm
2017-07-31 02:14:15 -05:00
0bba1ec9b6
Update miscellaneous.dm
2017-07-31 02:13:42 -05:00
fe37d52cc5
Update hardsuit.dm
2017-07-31 02:12:22 -05:00
4c0c11524b
Update syndi.dm
2017-07-30 23:32:50 -05:00
a99fa2ea49
Update plasmamen.dm
2017-07-30 23:31:33 -05:00
e3dfc8b61d
Update miscellaneous.dm
2017-07-30 23:30:51 -05:00
85885330ba
Update hardsuit.dm
2017-07-30 23:29:36 -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
2ae38397c9
removes current method of handling flightsuit pulling ( #2023 )
2017-07-15 11:40:34 -07:00
bd3c3e9de4
Removes the entry in sound.dm for servostep.ogg ( #2004 )
2017-07-14 19:35:48 -07:00
85fa3c0bee
[MIRROR] Refactors flightsuit code to hopefully be less dumb ( #1975 )
...
* Refactors flightsuit code to hopefully be less dumb
* Update flightsuit.dm
* Delete flightsuit.dm.rej
* Delete objs.dm.rej
* Delete mob_movement.dm.rej
* Delete carbon_movement.dm.rej
* Update mob_movement.dm
* Update flightsuit.dm
* Update mob_movement.dm
* fix
2017-07-12 05:24:50 -07:00
ff6bbbedf5
Changes some 1s and 0s to TRUE and FALSE ( #1967 )
2017-07-10 16:13:16 -07:00
1b70c06474
Renames GLOB.cardinal to GLOB.cardinals to match GLOB.diagonals and GLOB.alldirs ( #1970 )
2017-07-10 16:10:42 -07:00
swindly