2a8e772131
Merge branch 'master' of https://github.com/tgstation/-tg-station into newshotguns
...
Conflicts:
code/modules/projectiles/ammunition/magazines.dm
code/modules/projectiles/guns/projectile/shotgun.dm
icons/mob/back.dmi
icons/obj/gun.dmi
2014-10-19 17:30:47 -07:00
c5ed446f24
Merge pull request #5300 from phil235/DroneArrestFix
...
Fix for #5281
2014-10-19 18:54:33 -05:00
4adb8c0c9a
Merge pull request #5316 from xxalpha/fix_flasher
...
Fixes cyborgs being able to add their flashes to things
2014-10-19 17:44:30 -05:00
d9dafa9649
Fix cyborg flashes being useable in flashers and cyborg heads.
2014-10-19 04:35:10 +01:00
ebeba833e7
reverts wizard jumpsuit stuff
2014-10-18 19:31:56 -07:00
a88da6dc11
wizard repathing and jumpsuit code fixes
2014-10-18 14:43:28 -07:00
c7dd1dc133
hotfix for some clothing bugs
2014-10-18 14:00:08 -07:00
003351ae77
Merge pull request #5231 from Jordie0608/thesetypofixesdedicatedtoshakespeare
...
[MAP] Adds riot shotgun for spawn in armory
2014-10-18 16:47:13 +02:00
05f63d6181
Merge pull request #5238 from paprka/removegreyshirt
...
Adds random jumpsuit colors for assistants
2014-10-17 14:34:58 -05:00
929662ad3a
moved files and fixed tablecrafting
2014-10-17 10:30:04 -07:00
f54cafad83
converted most gun crafting to its own module
2014-10-17 09:15:54 -07:00
5159889153
Fixes secbot hunting, stunning and arresting maintenance drones that attack them. Secbot won't hunt them anymore, just like with silicons. Fix is done by adding a assess_threat() proc in simple_animal/drone that returns -10 (similar to silicons)
2014-10-17 18:04:33 +02:00
98d3ce08ed
Merge pull request #5254 from paprka/underwearredux
...
Underwear updates
2014-10-17 07:55:34 -07:00
3224cdc151
Merge pull request #5182 from RemieRichards/XenoLeaping
...
Alien hunter leap ability
2014-10-17 07:36:57 -07:00
76dddc56a0
Merge branch 'master' of https://github.com/tgstation/-tg-station into thesetypofixesdedicatedtoshakespeare
...
Conflicts:
icons/obj/gun.dmi
2014-10-17 22:50:48 +11:00
8312c52286
Merge branch 'master' of https://github.com/tgstation/-tg-station into removegreyshirt
...
Conflicts:
icons/mob/uniform.dmi
2014-10-16 21:29:10 -07:00
e124c29f8d
Merge pull request #5201 from Cheridan/permits
...
Adds Construction Permits
2014-10-17 05:24:37 +01:00
1b8c69324f
Merge pull request #5075 from Incoming5643/FuckIKEA
...
Carpet is now growable, whoa!
2014-10-16 23:00:07 -05:00
eb6e35bb54
adds sawing off to improvised shotgun
2014-10-16 10:52:42 -07:00
c29cc89864
Merge branch 'master' of https://github.com/tgstation/-tg-station into newshotguns
...
Conflicts:
icons/obj/gun.dmi
2014-10-16 09:26:26 -07:00
2ba66a3f3d
Merge pull request #5259 from Aranclanos/SQL2logs
...
SDQL2 admin notice
2014-10-16 08:59:14 -05:00
13b59d2d0e
Merge pull request #5165 from paprka/INGLEWOODINGLEINGLEWOOD
...
Expands medipens & mining
2014-10-16 08:44:36 -05:00
ccce2ee125
Merge pull request #5149 from RemieRichards/paprikaisbutthurt
...
Drones being picked up - Rebalance
2014-10-16 08:42:28 -05:00
368832093f
Merge pull request #5185 from JJRcop/drone-tweaks
...
Drone Tweaks, Adjustments, Additions
2014-10-16 08:41:31 -05:00
ec579469a7
Merge pull request #5269 from AnturK/fixuno
...
Fix for #5247
2014-10-16 08:36:12 -05:00
865391d6a1
Merge pull request #5233 from Jordie0608/stateoftheiconstates
...
[MAP] Fixes energy guns, coins, arrivals chairs and syndiebombs not having icons in map editor
2014-10-16 08:28:13 -05:00
17c9aaa6dd
Merge pull request #5263 from Aranclanos/electropackrevamp
...
Electropack fixes
2014-10-16 08:08:57 -05:00
d244fd6bbd
initial commit
2014-10-15 13:29:19 -07:00
c83592263b
Revert removal of kinky underwears
...
w/e
2014-10-15 12:30:36 -07:00
3e30a7fbab
Nothing to see here, move along.
2014-10-15 11:40:12 -03:00
fae181be7c
Narsie now has a spawn animation
2014-10-15 15:23:44 +01:00
4256e2f264
Merge branch 'master' of https://github.com/tgstation/-tg-station into XenoLeaping
...
Conflicts:
icons/mob/alien.dmi //Curse you WJ!
2014-10-15 15:08:12 +01:00
d2d92dd35f
Merge pull request #4873 from optimumtact/clicktyclackety
...
Adds click cooldown to clicking on mobs Fixes #4812 Take2
2014-10-15 11:03:02 -03:00
722e0ef6e1
Merge pull request #5244 from Lo6a4evskiy/Pocket_runtime_fix
...
Fixed stripping items from pockets runtime
2014-10-15 10:52:09 -03:00
e6c533eb95
Merge pull request #5253 from phil235/SandstoneStackFix
...
You can no longer make stacks of grasstile/sandstone bigger than max amount
2014-10-15 10:46:58 -03:00
0063e45ec1
Merge pull request #5236 from phil235/SignalerBugFix
...
Fixes some runtimes linked to signalers.
2014-10-15 10:44:51 -03:00
a31b372ea7
Merge pull request #5171 from phil235/ed209fix
...
A lot of secbot/ed-209 fixes.
2014-10-15 10:42:30 -03:00
cd9e62a7c2
Merge pull request #5220 from Menshin/false_alarm_runtimes_fix
...
Fixes false alarm event runtime
2014-10-15 11:57:21 +01:00
3b074ea251
Merge pull request #5204 from Menshin/don't_use_force_on_paper_bins
...
Prevent grabbing paper bins from the other side of the station.
2014-10-15 11:57:03 +01:00
89a13aeccc
Merge pull request #5219 from phil235/robotaccesspdafix
...
Cyborgs can now be unlocked by pda with ID inside
2014-10-15 11:56:28 +01:00
d28e56e5af
Fix for #5247
2014-10-15 11:35:53 +02:00
a1d49cfeb4
Changes the path of electropacks from objitemdeviceradioelectropack to objitemdeviceelectropack.
...
Fixes some runtimes related to electropacks.
Securing electropacks will no longer be required to use a helmet on it, same with dissembling the shockkit with a wrench or placing it in a chair.
Removes the atom var 'moved_recently' that was only used by electropacks (really). Now the electropack will have an inner cooldown instead.
The cooldown of the shock will be 10 seconds, giving the shocked person some small time to move in-between shocks (the shock gives you 5 of weakened).
2014-10-14 21:44:56 -03:00
2a338abd58
Added NOTICE() for world.log messages that aren't errors or warnings.
...
The message that SDQL2 query outputs will now properly state the ckey of the user.
2014-10-14 20:06:37 -03:00
69bbeb6815
underwear updates
2014-10-14 15:02:06 -07:00
d85beb0d0a
Fixing sandstone stacking.
2014-10-14 21:56:36 +02:00
d66b0e61f0
Fixes the ability to make stacks of grasstile/sandstone larger than the max amount authorized.
...
Fixes an error in the amount of grasstiles produced.
Fixes some unnecessary capitalisation in mineral deposit names.
2014-10-14 21:22:08 +02:00
f9ded2c9ff
Merge pull request #5217 from Perakp/unacidablePortal
...
Unacidable gateway
2014-10-14 09:28:25 -05:00
2011307e55
moved psychadelic jumpsuit and repathing
2014-10-14 03:02:34 -07:00
3d8bbbbd77
Fixed runtime
2014-10-14 12:27:05 +04:00
1fd21a130b
Makes riot shotgun unique
2014-10-14 15:47:43 +11:00
paprka
Cheridan
xxalpha
Swag McYolosteinen
phil235
hornygranny
Jordie0608
Remie Richards
paprka
Aranclanos
AnturK
Lo6a4evskiy