25d8ffbcdf
Fixes borg naming rejecting numbers in name
2014-05-31 11:43:12 +02:00
4905beb67e
Removes hacky code in favour of a process() check for the nuke disk's location
...
Instead of having a lot of hacky checks to prevent the disk from leaving the Z-level, it will be checked periodically by process() if Z > 2
2014-05-30 22:01:20 -06:00
2ebf4f57e5
under/det into under/rank/det
2014-05-31 00:38:53 +02:00
cc7760c628
Merge pull request #3750 from hornygranny/tablethisfornow
...
fixes #3746 fixes #3706
2014-05-28 18:58:11 +02:00
5aa17924b3
Fixes Robocop board not working
2014-05-27 15:59:10 -05:00
af2e792036
2oop4u
2014-05-27 12:07:53 -07:00
6b7d3f49a9
muh OOP
2014-05-27 10:40:15 -07:00
67482d6e87
Merge pull request #3794 from Menshin/power_distribution_tweaks
...
Power distribution tweaking
2014-05-27 10:04:25 +01:00
82b861702f
Resolved Conflicts:
...
code/modules/mob/living/simple_animal/constructs.dm
2014-05-25 10:59:08 -06:00
6c537b45c1
Merge pull request #3791 from phil235/WindowSndFix
...
Fix for window unwrenching noise
2014-05-25 14:19:22 +02:00
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
21fdd8d7e4
Merge pull request #3723 from Ikarrus/monkeyimplants
...
Monkeys can be loyalty implanted
2014-05-24 19:51:46 +02:00
a5a91eaffc
Fixes unwrenching noise
2014-05-24 19:34:06 +02:00
6bf97eb280
Merge pull request #3774 from Rolan7/Issue_1063
...
Fixes dodgeballs
2014-05-22 16:00:55 -05:00
18ebcc0e45
Merge pull request #3720 from hornygranny/readingrainbow
...
carved books now turn into storage items
2014-05-21 22:16:45 -05:00
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
3e4a6128a1
colons removed, thanks RR
2014-05-20 10:28:13 -07:00
e1998e621b
Improved bomb logging
...
-Logging added for activating timers attached to transfer valves
-A quick link to the Signallers list has been added to bomb logs involving signallers
2014-05-19 22:25:10 -06:00
ec467852e7
missing "
2014-05-19 14:28:50 -07:00
294e242c07
fixes #3746 fixes #3706
2014-05-19 14:23:43 -07:00
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
50817435f0
Merge pull request #3721 from hornygranny/meltingsnow
...
Snowflake garbage removed
2014-05-19 07:15:24 +01:00
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
584a014a12
Hopefully last change
2014-05-18 22:46:32 +04:00
a576cb7fea
Part 2
2014-05-18 21:42:20 +04:00
1d4a6c5d26
Merge branch 'master' into slimes
...
Conflicts:
code/modules/mob/living/carbon/metroid/metroid.dm
2014-05-18 21:38:25 +04:00
ed5f8a0ee6
Fixes, part 1
2014-05-18 21:27:40 +04:00
36bb032957
Merge pull request #3509 from Cheridan/MeteorsSuck
...
Meteor Stuff
2014-05-17 18:42:16 -05:00
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
937170994d
tray hit restored to glory
2014-05-16 16:36:53 -07:00
10b4e9e138
Snowflake garbage removed
2014-05-16 15:22:37 -07:00
1bf05c4406
Merge pull request #3679 from CollenN/modulesprites
...
Adds Electric Arm Sprite
2014-05-16 22:57:50 +01:00
2552946fd5
forgot to include the fucking book itself
2014-05-16 14:43:19 -07:00
d0015287de
carved books now turn into storage items
2014-05-16 14:30:04 -07:00
8c1e1e1423
Resolved stupid map conflicts
2014-05-15 09:12:47 -06:00
89017d08b5
Merge pull request #3698 from Deantwo/Grenade-Name
...
Fixed grenade casing name not changing
2014-05-15 13:57:38 +01:00
81509c0c66
Ups fixes
2014-05-14 18:40:33 +02:00
a8cab7e396
String building and stage_change method
...
-
2014-05-14 17:11:35 +02:00
8496ec8dd1
Should be auto-mergable again
2014-05-14 08:57:52 -06:00
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
https://github.com/tgstation/-tg-station/commit/f645037dd5ffe491c94f73a39b3aac312e51d579 )
- The grenade assembly is called "grenade" when finished (like before
https://github.com/tgstation/-tg-station/commit/f645037dd5ffe491c94f73a39b3aac312e51d579 )
- 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
bcac0812c5
Merge pull request #3585 from Aranclanos/ViolinAndPiano
...
canUseTopic()
2014-05-14 11:05:17 +01:00
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
084510a743
Merge pull request #3391 from Donkie/sofa
...
Sofa / Comfychair update
2014-05-14 10:37:06 +01:00
0eb1af3331
Merge pull request #3659 from AnturK/stuffz
...
Fixes one-way locks
2014-05-14 09:58:05 +01:00
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
6686b2ec7c
Merge pull request #3687 from Jordie0608/removerelativepathsfromtheeverythingplz
...
Fixes #3681 : suicide messages when crit
2014-05-14 09:24:29 +01:00
3a0bd3de28
Merge branch 'master' of https://github.com/tgstation/-tg-station into MeteorsSuck
...
Conflicts:
code/game/turfs/simulated/walls.dm
2014-05-13 14:03:42 -05:00
e13ab9422d
Merge pull request #3610 from Aranclanos/washingmachine
...
Washing machine fixes
2014-05-13 16:55:26 +01:00
2aefeb0b81
Sechud uses right icon
2014-05-12 16:35:30 -04:00
5b94391e6f
Unidentinization^2
2014-05-13 02:25:14 +10:00
inorix
ikarrus
phil235
Miauw62
Cheridan
Hornygranny
Alex
Menshin
Rolan7
Kelenius
Deantwo
fleure
CollenN
Jordie0608