d38a4a2aa5
Merge pull request #33905 from ShizCalev/jumpsuit-fix
...
Fixes being able to adjust jumpsuits without an adjust state w/ chameleon & random jumpsuit
2017-12-29 10:10:30 -06:00
8a792d6ef6
more save points
2017-12-29 00:07:36 -06:00
164db7ae9b
Prefixed all disability defines with DISABILITY_ to fix a name collision
2017-12-24 15:03:30 -06:00
92c347d068
Merge branch 'master' into upstream-merge-33246
2017-12-20 00:27:06 -06:00
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
cc0b768c72
[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES ( #4014 )
...
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES
* resetting all the maps because we can worry about them later.
* Regexing
* I'm fucked
* Fixes
* .
* maps
* bleh
* ree
* fixes
2017-12-11 16:36:38 -08:00
6bfca33a78
Roundend report refactor
2017-12-11 10:58:23 -06:00
04ea26f6ee
Merge pull request #33444 from Dorsisdwarf/gloves
...
Changes captain glove description
2017-12-11 08:59:36 -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
742d50b5e7
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into donoritemmodularization
...
# Conflicts:
# code/citadel/custom_loadout/custom_items.dm
# code/datums/components/riding.dm
# code/game/objects/items/implants/implantuplink.dm
# icons/mob/neck.dmi
# icons/obj/clothing/cloaks.dmi
2017-12-08 19:58:41 -05: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
7b3c2862d3
Stethoscope defibrillation checking ( #33234 )
2017-12-05 03:22:48 -06:00
f57e02ce95
Merge branch 'master' into donoritemmodularization
2017-12-04 20:17:02 -05:00
507c862c7c
Update hud.dm
2017-11-28 22:24:00 -05: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
eba36e48f9
Merge pull request #3984 from Citadel-Station-13/upstream-merge-32188
...
[MIRROR] JSON feedback
2017-11-22 18:42:34 -06:00
8d39fb9dce
merges https://github.com/tgstation/tgstation/pull/32678
2017-11-22 17:40:25 -05:00
b6630b41d1
merges #3877 proper
2017-11-22 17:37:22 -05:00
3b1067ba7a
Update pants.dm
2017-11-22 14:56:26 -05:00
c5adadc5d1
Update engineering.dm
2017-11-22 14:54:01 -05:00
5d2c5add1f
Update color.dm
2017-11-22 14:50:37 -05:00
b24c9335b3
Update jobs.dm
2017-11-22 14:48:35 -05:00
5e6e725666
Update color.dm
2017-11-22 14:47:15 -05:00
2dbe3e3b82
Update chameleon.dm
2017-11-22 14:46:06 -05:00
6ab499b57b
Fixes bartender suit having an adjust state
2017-11-22 12:40:32 -06:00
1f6b3ce629
Merge branch 'master' into upstream-merge-32188
2017-11-21 19:53:58 +00:00
2498e1ddc0
Cleans up unused code
2017-11-20 10:14:32 -06:00
5bb8a1b962
Merge pull request #32853 from KorPhaeron/purple
...
Fixes purple bartender clothes
2017-11-19 22:55:03 -06:00
eeba86e27e
Merge branch 'master' into upstream-merge-32188
2017-11-18 05:31:42 +00:00
0beef30fb7
Adds a purple bartender suit and apron, and Long Hair 3 - Requested and sprites by Okand37! ( #3993 )
2017-11-17 19:02:40 -08:00
b7e99a7448
JSON feedback
2017-11-17 01:44:12 -06:00
952fa2a0f2
Fix conflicts between helmet/mech HUDs and HUD glasses
2017-11-16 15:39:15 -06:00
1939e96bb6
Merge branch 'master' into upstream-merge-32183
2017-11-15 10:22:40 -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
14944d8711
Merge branch 'master' into upstream-merge-32183
2017-11-12 23:09:55 -06:00
6286f4d4c2
Merge branch 'master' into upstream-merge-32161
2017-11-11 23:02:13 -06:00
64d0c4711f
Merge pull request #32583 from Iamgoofball/patch-334
...
Frog masks no longer have a sound
2017-11-11 14:31:37 -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
0ca35e765d
Merge pull request #3842 from Citadel-Station-13/upstream-merge-32456
...
[MIRROR] [s] Removes a handful of ways ghosts can affect the world
2017-11-07 04:44:08 -06:00
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