Commit Graph

2920 Commits

Author SHA1 Message Date
Malkevin
67fdbfbaaf Funfact: pickweight doesn't like numbers unless they're in a string. 2014-06-07 21:42:27 +01:00
Malkevin
6aa15e7337 Changed IEDs into firebombs.
Changed IEDs into firebombs to curtail the amount of station damage done whilst keeping IEDs useful and still keeping fuel tank bombs a useful saboteur's tool.

Their fuse time is a bit more variable too, including a 1 in 10 chance of them going off practically straight away (note: this is counter-able by the user wearing a fire-suit, git gud and l2p)
2014-06-07 03:18:21 +01:00
Alex
d0db8fdbed Merge pull request #3832 from phil235/StunprodFix
Stunprod Fix
2014-06-05 21:40:45 +01:00
Cheridan
b3a1426791 Merge pull request #3825 from inorix/borg-name-numbers-fix
Fixes borg naming rejecting numbers in name
2014-06-02 15:40:21 -05:00
phil235
40fbe585ba Warning message replaced by sparks sound 2014-06-02 01:42:50 +02:00
phil235
2be11ab55e Fix 2014-06-02 01:01:16 +02:00
phil235
8c6cd7b28f Stunprod Fix
* Fix icon not updating when turning off baton/stunprod with a total cell charge below the hitcost.
* Baton/stunprod no longer accepts cell with capacity below the hitcost(charge used per stun).
* Removes being able to give one last hit (that doesn't even deduct any charge) when the cell charge gets below the hitcost.
* Adds warning message when baton/stunprod turns off from being out of charge.
2014-06-02 00:42:23 +02:00
Miauw62
44f769208c Merge pull request #3804 from Cheridan/roboShlock
Fixes Robocop board not working
2014-06-01 12:16:16 +02:00
inorix
25d8ffbcdf Fixes borg naming rejecting numbers in name 2014-05-31 11:43:12 +02:00
Miauw62
cc7760c628 Merge pull request #3750 from hornygranny/tablethisfornow
fixes #3746 fixes #3706
2014-05-28 18:58:11 +02:00
Cheridan
5aa17924b3 Fixes Robocop board not working 2014-05-27 15:59:10 -05:00
Hornygranny
af2e792036 2oop4u 2014-05-27 12:07:53 -07:00
Hornygranny
6b7d3f49a9 muh OOP 2014-05-27 10:40:15 -07:00
Alex
67482d6e87 Merge pull request #3794 from Menshin/power_distribution_tweaks
Power distribution tweaking
2014-05-27 10:04:25 +01:00
ikarrus
82b861702f Resolved Conflicts:
code/modules/mob/living/simple_animal/constructs.dm
2014-05-25 10:59:08 -06:00
Miauw62
6c537b45c1 Merge pull request #3791 from phil235/WindowSndFix
Fix for window unwrenching noise
2014-05-25 14:19:22 +02:00
Menshin
6749f21042 Tweaked the power distribution handling :
* the power is correctly handled each tick instead of 1 tick on 2, because of bad reinitalization,
* apcs now draw power as others machines and fixed the amount of power send to them

Partially fixes #3761.
2014-05-25 00:54:41 +02:00
Miauw62
21fdd8d7e4 Merge pull request #3723 from Ikarrus/monkeyimplants
Monkeys can be loyalty implanted
2014-05-24 19:51:46 +02:00
phil235
a5a91eaffc Fixes unwrenching noise 2014-05-24 19:34:06 +02:00
Cheridan
6bf97eb280 Merge pull request #3774 from Rolan7/Issue_1063
Fixes dodgeballs
2014-05-22 16:00:55 -05:00
Cheridan
18ebcc0e45 Merge pull request #3720 from hornygranny/readingrainbow
carved books now turn into storage items
2014-05-21 22:16:45 -05:00
Rolan7
e89a07dcf4 Dodgeballs now call the super code so they can be caught, theoretically deal real impact damage, and they actually give messages on hit. Fixes #1063, and makes dodgeball not so eerily quiet. Also fixes "too large to fit in this the backpack" in storage.dm. 2014-05-21 14:37:55 -04:00
Hornygranny
3e4a6128a1 colons removed, thanks RR 2014-05-20 10:28:13 -07:00
Hornygranny
ec467852e7 missing " 2014-05-19 14:28:50 -07:00
Hornygranny
294e242c07 fixes #3746 fixes #3706 2014-05-19 14:23:43 -07:00
Rolan7
e88528771d Merge branch 'master' of https://github.com/tgstation/-tg-station into Issue236_Trays
Conflicts:
	code/game/objects/items/weapons/kitchen.dm (Resolved, we were both removing snowflakey tray code)
2014-05-19 03:36:07 -04:00
Alex
50817435f0 Merge pull request #3721 from hornygranny/meltingsnow
Snowflake garbage removed
2014-05-19 07:15:24 +01:00
Rolan7
a36afba82a Merge branch 'master' of https://github.com/tgstation/-tg-station into Issue236_Trays
Conflicts:
	_maps/map_files/tgstation.2.1.2.dmm (The map was deleted)
	code/game/objects/items/weapons/kitchen.dm (Someone fixed up tray attack code a little, whereas I moved trays to a subclass of bags and made the attack code very simple by comparison.  Went with my solution.)
2014-05-18 20:50:38 -04:00
Kelenius
584a014a12 Hopefully last change 2014-05-18 22:46:32 +04:00
Kelenius
a576cb7fea Part 2 2014-05-18 21:42:20 +04:00
Kelenius
1d4a6c5d26 Merge branch 'master' into slimes
Conflicts:
	code/modules/mob/living/carbon/metroid/metroid.dm
2014-05-18 21:38:25 +04:00
Kelenius
ed5f8a0ee6 Fixes, part 1 2014-05-18 21:27:40 +04:00
Cheridan
36bb032957 Merge pull request #3509 from Cheridan/MeteorsSuck
Meteor Stuff
2014-05-17 18:42:16 -05:00
ikarrus
c7fc7f4811 Monkeys can be loyalty implanted
Monkeys can still be revs, so they should be able to be loyalty implanted. This would also fall in line with the other implants, which have no race restriction.

Fixes #637
2014-05-16 22:17:06 -06:00
Hornygranny
937170994d tray hit restored to glory 2014-05-16 16:36:53 -07:00
Hornygranny
10b4e9e138 Snowflake garbage removed 2014-05-16 15:22:37 -07:00
Alex
1bf05c4406 Merge pull request #3679 from CollenN/modulesprites
Adds Electric Arm Sprite
2014-05-16 22:57:50 +01:00
Hornygranny
2552946fd5 forgot to include the fucking book itself 2014-05-16 14:43:19 -07:00
Hornygranny
d0015287de carved books now turn into storage items 2014-05-16 14:30:04 -07:00
ikarrus
8c1e1e1423 Resolved stupid map conflicts 2014-05-15 09:12:47 -06:00
Alex
89017d08b5 Merge pull request #3698 from Deantwo/Grenade-Name
Fixed grenade casing name not changing
2014-05-15 13:57:38 +01:00
Deantwo
81509c0c66 Ups fixes 2014-05-14 18:40:33 +02:00
Deantwo
a8cab7e396 String building and stage_change method
-
2014-05-14 17:11:35 +02:00
ikarrus
8496ec8dd1 Should be auto-mergable again 2014-05-14 08:57:52 -06:00
Deantwo
9e2f0f0fda Fixed grenade casing not being renamed to grenade when complete
Fixed grenade casing not being renamed to grenade when complete and made
all assembly messages refer to the assembly as "grenade assembly".

- The grenade assembly is called "grenade casing" before anything is
done (like it always was)
- The grenade assembly is called "unsecured grenade" when a activation
mechanism is added (like before

f645037dd5)
- The grenade assembly is called "grenade" when finished (like before

f645037dd5)
- Renamed large chem grenade to "large grenade casing"
- Made using a wrench on a unsecured grenade remove the payload on the
first use, and the activation mechanism on the second use (because we
don't want to always remove both at the same time)
- Made cable_coil drop on the floor if it was used as activation
mechanism

Fixes https://github.com/tgstation/-tg-station/issues/2378
2014-05-14 16:09:12 +02:00
Alex
bcac0812c5 Merge pull request #3585 from Aranclanos/ViolinAndPiano
canUseTopic()
2014-05-14 11:05:17 +01:00
Alex
0d531eacf6 Merge pull request #3543 from paprka/stechupdate
Adds Stechkin pistol and Bond bundle to traitor uplink
2014-05-14 10:51:46 +01:00
Alex
084510a743 Merge pull request #3391 from Donkie/sofa
Sofa / Comfychair update
2014-05-14 10:37:06 +01:00
Alex
0eb1af3331 Merge pull request #3659 from AnturK/stuffz
Fixes one-way locks
2014-05-14 09:58:05 +01:00
Alex
66feb77503 Merge pull request #3677 from Kelenius/dualsaberfix
Fix for #2660: clowns killing themselves with toy dualsabers
2014-05-14 09:27:37 +01:00