Yoshax
fcf34eb54b
Puts a couple of crates into the right file
2016-07-23 20:08:24 +01:00
Yoshax
b5d85c7d71
Converts the empty box supply crate into a shipping supplies crate
2016-07-23 20:05:59 +01:00
Yoshax
0039a0bba8
Gives the chef a destination tagger and package wrapping
2016-07-23 20:01:22 +01:00
Neerti
3896f8b3c1
Merge pull request #2178 from Yoshax/robotupgrades
...
Robot upgrades now checks that the upgrade type is valid.
2016-07-23 11:45:41 -04:00
Yoshax
d7cec236a6
Adds changelog
2016-07-23 16:15:25 +01:00
PsiOmegaDelta
76dc56bd2b
Robot upgrades now checks that the upgrade type is valid.
...
As opposed to the instance itself. Fixes #13652 .
2016-07-23 16:13:29 +01:00
Neerti
d659dd9208
Merge pull request #2171 from redstryker/Flannel_fix
...
Fixes Flannels. Also adds a Brown Flannel
2016-07-22 19:22:44 -04:00
Neerti
43ca0160f5
Merge pull request #2172 from Yoshax/uplinkround
...
Ensures there's no funny business with powering up emags
2016-07-22 19:14:43 -04:00
Yoshax
3f0a95ae3a
Ensures there's no funny business with powering up emags
2016-07-22 23:05:54 +01:00
redstryker
dccc6f5713
Fixes Flannels. Also adds a Brown Flannel
2016-07-22 16:09:51 -04:00
Neerti
7930dcd8d7
Merge pull request #2170 from Yoshax/changelogerino
...
Updates changelog
2016-07-22 16:06:46 -04:00
Yoshax
cd3029d1f9
Updates changelog
2016-07-22 19:41:39 +01:00
EmperorJon
a94cad7a59
Merge pull request #2168 from Yoshax/telecrystals
...
Multiplies all Telecrystal stuff by ten to setup for fine cost adjusting
2016-07-22 19:34:08 +01:00
EmperorJon
68f83c3c9e
Merge pull request #2163 from Neerti/7/22/2016_ghost_texting
...
Communicator Texting for Ghosts
2016-07-22 19:33:46 +01:00
Neerti
c185b7c22b
Merge pull request #2165 from Yoshax/removebucklecuffing
...
Makes handcuff resisting take priority over unbuckle resisting by removing bucklecuff resisting
2016-07-22 14:21:31 -04:00
Neerti
ae91b6d2f8
Changelog
2016-07-22 14:16:42 -04:00
Neerti
92f74e12a6
Merge pull request #2169 from Yoshax/coffeeisyummy
...
Removes adverse effects to Tajaran drinking coffee
2016-07-22 14:13:47 -04:00
Yoshax
a2e230ecb9
Adds changelog
2016-07-22 18:08:26 +01:00
Yoshax
b2a704904c
Removes adverse effects to Tajaran drinking coffee
2016-07-22 18:07:08 +01:00
Neerti
ae497b0dd8
Communicator Texting for Ghosts
...
Ghosts can now text communicators in round, and can be texted by those back.
This is obviously logged, just in-case funny business occurs.
Adds verbs to display a log of messages that a ghost has sent and received, as well as a verb to send a message to a communicator of their choice.
2016-07-22 12:51:00 -04:00
Yoshax
21f856ed47
Multiplies all Telecrystal stuff by ten to setup for fine cost adjusting
2016-07-22 17:35:20 +01:00
EmperorJon
a59849b8df
Merge pull request #2167 from Yoshax/hubitup
...
Does the standard greytide welcoming
2016-07-22 16:49:32 +01:00
Yoshax
1d0da51005
Does the old in 'n out
2016-07-22 16:11:45 +01:00
Yoshax
f493ac7e17
Removes debug lines
2016-07-22 15:53:54 +01:00
Yoshax
fc62c90541
Adds changelog
2016-07-22 15:50:05 +01:00
Yoshax
013a509b17
Makes handcuff resisting take priority over unbuckle resisting by removing bucklecuff resisting
2016-07-22 15:48:47 +01:00
EmperorJon
0f46a1855c
Merge pull request #2164 from Yoshax/changelog
...
Adds and updates changelog/s
2016-07-22 15:45:45 +01:00
Yoshax
1f9608ddb5
Updates changelog
2016-07-22 14:48:25 +01:00
Yoshax
9423d30a6c
Adds changelogs
2016-07-22 14:44:43 +01:00
Neerti
3e19b337de
Merge pull request #2157 from redstryker/SG_Logo
...
Adds SolGov Logo to Paperwork and SolGov Stamps
2016-07-22 01:26:03 -04:00
Neerti
d12e9ac5fa
Merge pull request #2161 from Yoshax/bigtrio
...
Makes FBP burn repair actually work
2016-07-22 01:25:47 -04:00
Neerti
6b7e7a166b
Merge pull request #2162 from Yoshax/dislocate
...
Fixes undislocation
2016-07-22 01:25:41 -04:00
Yoshax
3a953d895f
Fixes undislocation
2016-07-22 04:19:49 +01:00
Yoshax
d4d76b07a7
Makes FBP burn repair actually work
2016-07-22 03:57:29 +01:00
Yoshax
c0a60faf73
Merge pull request #2159 from Neerti/7/21/2016_technomancer_additions
...
Technomancer Additions/Fixes
2016-07-21 23:38:21 +01:00
Neerti
09a57710a2
Technomancer Additions/Fixes
...
Moves spell HUD so it doesn't cover instability warning.
Makes Instability radiate out towards other humans at sufficently high amounts. People radiating instability will glow purple light. It is adviced to keep your distance or you will get instability as well.
Mark can no longer be cast on the admin z-level.
Adds Gambit, a spell which will randomly give you (almost) any spell that exists.
Shield now causes a bit of instability when blocking.
Recall will bring anyone who is grabbed along for the ride when cast.
Disposable Teleporters now function correctly.
Instability decays faster.
2016-07-21 18:22:15 -04:00
Neerti
253b138cfd
Merge pull request #2158 from Cameron653/master
...
Fixes a typo preventing field gens from being bought.
2016-07-21 17:59:10 -04:00
Cameron653
a84afa6e99
Fixes a typo preventing field gens from being bought.
2016-07-21 17:03:15 -04:00
redstryker
2e25267791
Adds SolGov logo to Paperwork and SolGov Stamps
2016-07-21 15:29:08 -04:00
EmperorJon
e5a0f45388
Merge pull request #2156 from Anewbe/s_ponytail
...
Fixes a pixel
2016-07-21 10:02:22 +01:00
EmperorJon
0d19b1fd7f
Merge pull request #2155 from Cameron653/master
...
Fixes a typo preventing potassium_chlorophoride from stopping the heart
2016-07-21 10:02:12 +01:00
Anewbe
f9e697f3b0
Fixes a pixel
2016-07-20 22:39:02 -05:00
Cameron653
45498c6886
Fixes a typo preventing potassium_chlorophoride from stopping the heart
...
Title
2016-07-20 21:15:02 -04:00
EmperorJon
1334b01693
Merge pull request #2132 from Cameron653/master
...
Makes biogenerator be accurate about a few product costs
2016-07-20 12:12:07 +01:00
EmperorJon
683bba42ee
Merge pull request #2135 from Anewbe/dual-wield_unathi
...
Unathi knives can now be wielded in unison
2016-07-20 12:11:21 +01:00
EmperorJon
c1cf145707
Merge pull request #2151 from Neerti/7/18/2016_technomancer_stuff
...
More Technomancer Work
2016-07-20 12:09:39 +01:00
EmperorJon
f11b8dffd4
Merge pull request #2152 from Mark9013100/7/19/2016uni_crate_edit
...
Removes the HoS trench from the security uniform crate
2016-07-20 12:08:10 +01:00
EmperorJon
6da285399f
Merge pull request #2153 from Mark9013100/7/19/2016beret_loadout
...
Adds the corporate berets to loadout
2016-07-20 09:44:11 +01:00
Mark9013100
f950b7ea23
Adds the corporate berets to loadout
2016-07-19 22:07:57 -04:00
Mark9013100
8e7b2e8fe0
Removes the HoS trench from the security uniform crate
2016-07-19 21:45:44 -04:00
