Cheridan
a5e3851b99
Merge pull request #5216 from phil235/bodybagfix1
...
closets can no longer contain a near infinite amount of mobs.
2014-10-21 12:15:30 -05:00
hornygranny
e556867a58
Merge pull request #5277 from paprka/newshotguns
...
Adds improvised shotguns and fixes paths for wrap paper
2014-10-21 09:51:35 -07:00
phil235
c2fcd21499
Adding bluespace bodybags. Adding changelog.
2014-10-21 17:27:40 +02:00
phil235
56c853f9d6
Merge branch 'master' of https://github.com/tgstation/-tg-station into bodybagfix1
...
Conflicts:
code/modules/mob/living/simple_animal/friendly/mouse.dm
2014-10-21 15:58:39 +02:00
hornygranny
51277f03c0
Merge pull request #5203 from Menshin/href_stacks_multiplier_fix
...
Prevent href exploit with stacks multipliers
2014-10-20 19:34:04 -07:00
hornygranny
55ff8ab432
Merge pull request #5206 from paprka/usedcuffs
...
Used zipcuffs name change
2014-10-20 19:28:10 -07:00
Cheridan
455b526cc1
Merge pull request #5318 from phil235/MsgFix2
...
More messages fixed
2014-10-19 21:39:06 -05:00
paprka
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
Cheridan
cb05cb64d1
Merge pull request #5306 from Aranclanos/flashruntime
...
Flashes runtime fix
2014-10-19 18:47:18 -05:00
Cheridan
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
Cheridan
21b198dc2c
Merge pull request #5314 from MrPerson/qdel_radios
...
Make radios garbage collect
2014-10-19 17:42:06 -05:00
xxalpha
091cbcca2c
deleted bad lines
2014-10-19 04:57:14 +01:00
xxalpha
d9dafa9649
Fix cyborg flashes being useable in flashers and cyborg heads.
2014-10-19 04:35:10 +01:00
phil235
9b9481d65c
Changes many span classes.
...
Replaces for(mob in oviewers) show_message() with visible_message() when possible.
Fixes the absolute pathing in Ninja code.
Fixes facehugger attack messages being bold red for third party (only the first leap message will stay bold red for third party, for better visibility)
Standardizes vomiting message
Fixes mech occupant not receiving any attack messages when the mech is attacked.
2014-10-18 16:00:38 +02:00
MrPerson
ec9f595b1f
Make radios garbage collect
2014-10-18 00:05:03 -07:00
Aranclanos
134c4d6209
Fixes a runtime with flashes when they burn out without user, now they'll display the burn out message from the src instead.
2014-10-17 16:42:51 -03:00
paprka
929662ad3a
moved files and fixed tablecrafting
2014-10-17 10:30:04 -07:00
hornygranny
c936f3134d
Merge pull request #5268 from paprka/zipeties
...
fixes zipeties typo
2014-10-17 07:35:07 -07:00
Remie Richards
e124c29f8d
Merge pull request #5201 from Cheridan/permits
...
Adds Construction Permits
2014-10-17 05:24:37 +01:00
paprka
85478315e6
Merge branch 'master' of https://github.com/tgstation/-tg-station into zipeties
2014-10-16 09:28:11 -07:00
paprka
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
Cheridan
a5638c7107
Merge pull request #5152 from paprka/medicalbeltsstuff
...
Hyposprays fit in medibelts now
2014-10-16 08:46:54 -05:00
Cheridan
13b59d2d0e
Merge pull request #5165 from paprka/INGLEWOODINGLEINGLEWOOD
...
Expands medipens & mining
2014-10-16 08:44:36 -05:00
Cheridan
01e7b0af6d
Merge pull request #5218 from Perakp/dnaInjectorGarbage
...
Garbage collect dna injectors
2014-10-16 08:34:50 -05:00
Cheridan
17c9aaa6dd
Merge pull request #5263 from Aranclanos/electropackrevamp
...
Electropack fixes
2014-10-16 08:08:57 -05:00
hornygranny
53cb161add
Merge pull request #5245 from paprka/removespammessages
...
Removes a few spammable visible messages
2014-10-15 16:41:09 -07:00
paprka
54b575523a
removes zippo changes
2014-10-15 16:32:51 -07:00
paprka
4c7831c4fd
Merge branch 'master' of https://github.com/tgstation/-tg-station into zipeties
...
Conflicts:
code/game/machinery/bots/secbot.dm
2014-10-15 13:32:24 -07:00
paprka
d244fd6bbd
initial commit
2014-10-15 13:29:19 -07:00
Aranclanos
9077c173d1
Merge pull request #4759 from Donkie/pipes2
...
Major Pipe Upgrade Hashtag 2
2014-10-15 11:36:25 -03:00
Aranclanos
bd2f0692d3
Merge pull request #5222 from phil235/c4GibFix
...
You can no longer gib mob with c4+signaler
2014-10-15 10:43:20 -03:00
Aranclanos
a31b372ea7
Merge pull request #5171 from phil235/ed209fix
...
A lot of secbot/ed-209 fixes.
2014-10-15 10:42:30 -03:00
Remie Richards
7bb012127c
Merge pull request #5235 from phil235/CollapsibleRollerBed
...
Collapsible Rollerbed
2014-10-15 11:54:48 +01:00
paprka
dc9d194706
fixes zipeties typo
2014-10-15 00:07:42 -07:00
Aranclanos
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
Menshin
11b8235f66
Href exploit fixing : the bugfree edition
2014-10-14 23:10:38 +02:00
paprka
40ab91a060
removes a few spammable visible messages
2014-10-14 04:58:42 -07:00
phil235
cd78c2b067
Adding puppies and kittens to the small mob category.
...
Increasing mob_storage_capacity for closet and bodybag to 4 and 6 respectively.
2014-10-13 19:03:56 +02:00
phil235
619a38ad89
Adds the ability to collapse rollerbed (from baystation). Fixes being able to pick up pill bottles and fold bodybags through windows via click drag.
2014-10-13 17:17:53 +02:00
Remie Richards
4640999701
Merge pull request #5199 from paprka/telebatonlog
...
stun logging for telebaton
2014-10-13 11:48:17 +01:00
Remie Richards
399977d882
Merge pull request #5095 from MrPerson/table_module
...
Move table crafting into the modules folder plus improvements
2014-10-13 10:42:16 +01:00
paprka
739cc29dbd
removes typecasting from zipcuffs cutting
2014-10-12 14:02:04 -07:00
paprka
8986181e44
fixes ziptie bug
2014-10-12 13:39:55 -07:00
phil235
f5eb963720
You can no longer gib mobs by placing a c4 with a signaler on its wire in the hands/pocket/backpack of the mob and sending the signal.
2014-10-12 22:17:37 +02:00
Perakp
562776e2fb
- Properly garbage collect dna injectors. Before you could pick them up if you were fast enough.
2014-10-12 20:50:23 +03:00
phil235
8e87ebaa1f
Fixing a silly typo.
2014-10-12 19:07:41 +02:00
phil235
36cbf06ed9
closets and its children can no longer contain a near infinite amount of mobs.
...
Adding a mob_size var to mob/living . All closets can still contain the same amount of small sized mobs as before(mouse, parrot,pAI, viscerator, lizard, chick), but they can no longer contain large mobs (alien emperess, blobbernaut, juggernaut, hostile tree, goliath), and they can contain a few human sized mobs (three for bodybags, two for closets and other children).
2014-10-12 18:46:56 +02:00
paprka
c83e0d65a0
used zipcuffs name change
2014-10-11 18:08:52 -07:00
Menshin
fb3200eba8
* prevent href exploit with stacks multiplier
2014-10-12 01:39:40 +02:00
Cheridan
5eb6a82970
Merge branch 'master' of https://github.com/tgstation/-tg-station into permits
...
Conflicts:
icons/obj/items.dmi
2014-10-11 17:48:46 -05:00
