408182758f
Merge branch 'master' into upstream-merge-33498
2017-12-19 17:50:11 -06:00
f875d4e176
Defines math, take 2
2017-12-17 10:02:43 -06: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
fcceb5ec77
Finishes the forceMove port
2017-12-14 15:40:08 -06:00
7f90427a40
Replaces a bunch of loc assignments with forcemoves and moves to nullspace
2017-12-13 13:56:57 -06:00
9b4396f7b6
Tweaks hardsuit's armor ratings ( #33428 )
2017-12-10 17:45:41 -06:00
30143ee601
Merge pull request #33414 from kevinz000/DAMNIT_DEATHRIDE_WHY_WHY_WHY_IM_SALTY_REEEEEEEEEEEEE
...
[READY]Fixes beam rifles and flightsuits
2017-12-10 15:19:18 -06:00
8b9e15d1b5
Merge pull request #33324 from deathride58/foreignfurryaddswidescreen
...
[Ready] Makes the default view range a config option (Allows hosts to enable widescreen)
2017-12-08 10:35:23 -06:00
b23c92b056
Added bot path data huds
2017-11-28 06:28:40 -06:00
2762e3b530
Fixes Lord Singuloth hungering for more than he should
2017-11-24 13:00:42 -06:00
6ab499b57b
Fixes bartender suit having an adjust state
2017-11-22 12:40:32 -06:00
952fa2a0f2
Fix conflicts between helmet/mech HUDs and HUD glasses
2017-11-16 15:39:15 -06:00
43113cd9b5
Merge pull request #31947 from AnturK/yarr
...
How does this work:
Station receives a communication extorting current cargo point, if they answer yes the points are just gone and nothing of interest happens.
If station refuses to pay or is silent for 3 minutes, pirate shuttle spawns somewhere in space.
There's an internal GPS onboard so crew will always be able to follow the shuttle.
Crew of 3, moderately armed. (Balance pending)
Shuttle engines have 3 minute cooldown between jumps.
Special shuttle equipment will block cargo and emergency shuttles from leaving and slowly steal the points.
2017-11-13 03:19:38 -06:00
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
LetterJay