Commit Graph

31208 Commits

Author SHA1 Message Date
Anewbe
efc20b7108 Anatomic Panacea clears ingested reagents 2016-07-10 03:39:51 -05:00
SinTwo
0bb5058a6a Merge pull request #2084 from Neerti/7/9/2016_ninja_fix
Ninja Powersink Fix
2016-07-10 00:35:33 -04:00
Neerti
3a298d1df0 Merge pull request #2081 from Yoshax/cheaperbots
Adjusts FBP and prosthetic limb producing costs
2016-07-10 00:12:50 -04:00
Neerti
d9504d82a6 Merge pull request #2080 from Yoshax/grippers
Added a chemistry gripper for crisis borgs
2016-07-10 00:12:37 -04:00
Neerti
925c7a075b Merge pull request #2082 from Yoshax/fbp
Fully removes floor-length braid instead of leaving it as a stupid meme
2016-07-10 00:12:15 -04:00
Neerti
19936ce06c Ninja Powersink Fix
Fixes ninja powersinks not working, and likely some other bugs involving rig gloves, like handcuffing.
2016-07-10 00:03:21 -04:00
Yoshax
af46ead9fd Fully removes floor-length braid instead of leaving it as a stupid meme 2016-07-10 04:42:19 +01:00
Yoshax
946f0a1d1b Adjusts FBP and prosthetic limb producing costs 2016-07-10 04:37:00 +01:00
BlueNexus
9cdbae9c37 Added a bottle-gripper
Rename

To squash
2016-07-10 04:24:25 +01:00
Yoshax
8d5560aa75 Merge pull request #2075 from Neerti/7/9/2016_airlock_fix
Makes clicking on airlocks work again.
2016-07-10 03:50:30 +01:00
Yoshax
e28c4361f7 Merge pull request #2015 from Neerti/12/16/2015_newwizard
Dry-dock phase for Technomancer
2016-07-10 03:43:35 +01:00
Neerti
bd306efd6a Merge pull request #2073 from Yoshax/medhuds
Medhuds
2016-07-09 22:42:51 -04:00
Neerti
ef018da9e8 Merge pull request #2074 from Yoshax/scaling
Add options for 3x and 4x upscaling, for players with very large monitors
2016-07-09 22:42:45 -04:00
Neerti
06b97aa990 Makes clicking on airlocks work again. 2016-07-09 22:37:51 -04:00
GinjaNinja32
3be7301574 Add options for 3x and 4x upscaling, for players with very large monitors 2016-07-10 03:28:04 +01:00
PsiOmegaDelta
60593ce024 Bay-tweaks.
Ultra dynamic MedHUD states.
2016-07-10 03:14:22 +01:00
PsiOmegaDelta
a9bae0d08e Changelog. 2016-07-10 03:13:28 +01:00
PsiOmegaDelta
8e82e70056 Makes the medHUD smoother.
It now has more stages, giving the viewer a little more detail about how badly you're doing.
Port of https://github.com/ParadiseSS13/Paradise/pull/4726.
2016-07-10 03:13:20 +01:00
PsiOmegaDelta
691349864b Adds variety to the critical MedHUD states
Makes it easier to prioritize who will receive treatment.
Port of https://github.com/tgstation/tgstation/pull/17279.
2016-07-10 03:13:05 +01:00
EmperorJon
108a8743f5 Merge pull request #2070 from Anewbe/pry
Adds a pry var to objects, which checks if the obj can open doors
2016-07-09 10:36:50 +01:00
EmperorJon
660861d8e0 Merge pull request #2071 from Anewbe/foam
Foam axes don't shatter windows
2016-07-09 09:05:50 +01:00
Anewbe
d932462f4f Foam axes don't shatter windows 2016-07-09 00:37:36 -05:00
Anewbe
f27fa6cc2b Adds a pry var to objects, which checks if the obj can open doors 2016-07-09 00:24:12 -05:00
Neerti
42a0e259a4 Merge pull request #2066 from Yoshax/advwho
Adds in an "Advanced who"
2016-07-08 23:21:51 -04:00
Neerti
5699fda7c3 Merge pull request #2068 from Yoshax/stacks
Adds material stack variants with base 50 amount for adminspawn etc
2016-07-08 23:21:36 -04:00
Neerti
7a5b287a20 Merge pull request #2067 from Anewbe/lings
Fixes the Ling bug
2016-07-08 23:21:04 -04:00
Yoshax
cf09435293 Adds material stack variants with base 50 amount for adminspawn etc 2016-07-09 04:04:40 +01:00
Anewbe
114dfcdff8 Fixes the Ling bug 2016-07-08 22:00:57 -05:00
Neerti
9e67df09f0 Adds map. Mapmerge is broken so the line numbers are huge. 2016-07-08 21:26:19 -04:00
Neerti
61e291a083 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 12/16/2015_newwizard 2016-07-08 21:00:12 -04:00
Neerti
8a61641479 Some more work + prep for drydocking. 2016-07-08 20:38:34 -04:00
Yoshax
d24afd78d2 Merge pull request #2065 from redstryker/Flannels
Adds Flannels
2016-07-09 01:10:01 +01:00
Cameron653
35d6a7d401 Adds in an "Advanced who"
Adds in an "Advanced who" which lets normal players see if someone is
observing/in the lobby/playing.
2016-07-08 22:59:25 +01:00
redstryker
8fe62d584f Adds Flannels 2016-07-08 17:32:44 -04:00
Neerti
5ea004ba1f Merge pull request #1920 from Yoshax/dumbnoisesgohome
Removes activation sounds from glasses that have them
2016-07-08 17:06:10 -04:00
Yoshax
0bc464337d Merge pull request #2062 from EmperorJon/08_Jul._Beruang_visits
Fixes one missing area tile on the Beruang
2016-07-08 19:51:18 +01:00
Jon
82e6232d27 Fixes one missing area tile. 2016-07-08 19:48:15 +01:00
EmperorJon
f8121ef1ba Merge pull request #2061 from Yoshax/changelog
Updates changelog
2016-07-08 19:10:59 +01:00
Yoshax
13f8b97595 Updates changelog 2016-07-08 18:18:51 +01:00
Neerti
8d5269be9a Merge pull request #2059 from EmperorJon/08_Jul._Beruang_visits
The Beruang can now be sent to visit the station by admins
2016-07-08 13:02:15 -04:00
EmperorJon
b5ff7a65d2 Merge pull request #2060 from Yoshax/hub
Cheap Man's hub password
2016-07-08 17:56:44 +01:00
Jon
3899b1f84c Changelog 2016-07-08 17:49:05 +01:00
Jon
d585fed77c Map updates 2016-07-08 17:43:34 +01:00
Yoshax
d67b5c8ad1 Cheap Man's hub password 2016-07-08 17:32:54 +01:00
Jon
0c04e05f6d Mapmerge 2016-07-08 16:27:33 +01:00
Jon
88debefe3e The Beruang can now sent to visit the station once per round, with traders gathered, in the same manner as the admin ERT call! 2016-07-08 16:07:34 +01:00
EmperorJon
de46ecbbe2 Merge pull request #2057 from Neerti/7/7/2016_end_sec_peeping
Makes communicators not show up on camera networks by default
2016-07-08 09:54:33 +01:00
EmperorJon
5b3c952be9 Merge pull request #2039 from SinTwo/smallfeatures
Water-Coolers, Floor Lamps, and Benches
2016-07-08 09:54:11 +01:00
EmperorJon
dd944dee8c Merge pull request #2054 from Yoshax/cocktails
Adds new non-alcoholic drinkd
2016-07-08 09:53:36 +01:00
Neerti
52e675277d Makes communicators not show up on camera networks by default, putting an end to security using their cameras to be peeping toms. 2016-07-07 22:33:43 -04:00