df7386a4ec
Assemblies update
2015-09-04 11:22:37 +03:00
bfbe4e997e
Merge pull request #11505 from duncathan/returnQDEL_HINT_LETMEDIE
...
Makes all Destroy() procs return properly
2015-09-01 15:54:18 +03:00
b2654acec5
Merge pull request #11247 from xxalpha/airlocking
...
Airlock Overlays
2015-09-01 11:49:05 +03:00
48b67e5a25
Merge branch 'master' of https://github.com/tgstation/-tg-station into returnQDEL_HINT_LETMEDIE
...
Conflicts:
code/game/objects/effects/landmarks.dm
2015-09-01 00:11:33 -06:00
3f29a9866c
Merge remote-tracking branch 'upstream/master' into qdelFixes
...
Conflicts:
code/modules/mob/living/silicon/robot/robot.dm
2015-08-31 08:52:30 +01:00
51c09f16bf
makes all Destroy()'s return properly
2015-08-31 00:21:01 -06:00
94f045b73f
Merge remote-tracking branch 'upstream/master' into airlocking
...
Conflicts:
_maps/map_files/MetaStation/MetaStation.v41F.dmm
code/game/objects/structures/door_assembly.dm
2015-08-30 19:53:54 +01:00
32d74ad19c
Merge pull request #11433 from Core0verload/framed
...
Buttons and wall frames rework
2015-08-30 13:43:19 -05:00
97b792bbc3
Changed some circuits paths to reduce copypasta
2015-08-30 16:58:13 +03:00
d824f7b35f
Merge pull request #11382 from Ergovisavi/bot_swarm
...
Adds "Swarmers" - Simple mob side antagonist
2015-08-28 00:21:23 -05:00
3737234b9c
-Adds swarmer as a language, makes them only able to speak to each other
...
-Fixes a few structures/machines taking non brute/burn damage from attack_animal
-Adjusts girders to be a little less resistant to explosions
-Span classes all the swarmer messages, bumps their health up to 40
-Adds ability for swarmers to dismantle machines and disable cameras. Some are obviously protected.
2015-08-27 22:10:30 -07:00
8474086bce
Buttons and wall frames rework
2015-08-28 02:01:49 +03:00
4ed1937168
Completed construction icons
2015-08-27 18:40:08 +01:00
b9db8ce854
A few qdel fixes.
2015-08-27 13:15:41 +01:00
382cd870aa
Airlock construction icons
...
Removed leftover comments
2015-08-27 10:05:46 +01:00
38e6a09cf9
Merge pull request #11351 from Core0verload/nodirt
...
Removes dirt from walking on tiles
2015-08-26 06:27:31 -03:00
9572bd6aa6
-First revision of Swarmer mob, hud, icons, etc
...
-Adds functionality of ignored damage types to simple mobs
-Adds functionality of melee damage types to simple mobs
2015-08-25 03:24:34 -07:00
9cfb246e4f
Removes dirt from walking on tiles
2015-08-24 11:33:52 +03:00
e0c6c710c2
Update barsigns.dm
2015-08-20 20:08:23 -04:00
6fe5f23e55
Updates dank memes.
...
updates Bar memes to reflect recent rule changes/be funny.
2015-08-20 15:06:42 -04:00
b70dfb8ece
Merge pull request #11189 from phil235/JanicartFixes
...
Slipping while buckled, some fixes
2015-08-18 20:26:36 +01:00
6b091e0cb6
Merge pull request #11086 from freerealestate/rcdrebalance
...
Rebalances RCD construction costs around metal construction menu costs
2015-08-14 15:14:25 +02:00
1cee0d3014
Fixes slipping on water while riding janicart.
...
The handle_slip() now also handles cases where the mob is buckled. If you are buckled and slip on lube (or something that ignores
galoshes) you get unbuckled and stunned and the buckle object moves one step (no slides unlike when unbuckled).
You can thus slip on lube while buckled to a chair or a roller bed.
Fixes getting hit by abstract held items when slipping.
Fixes janicart rider getting hit twice by bullets.
Removing the STEP constant var in slipping code, it's no more used.
Fixes carbon/slip() not returning the correct value.
Changed var/obj/structure/stool/bed/buckled to var/obj/buckled since buckled can now technically be any obj.
Removes hacky unbuckling/buckling in bed/Move()
2015-08-13 23:49:02 +02:00
46b519309e
Merge pull request #11058 from Core0verload/surgery-organs-part2
...
Surgery & Organs rework: Phase 2
2015-08-13 18:04:16 +02:00
2bb4f63023
Merge pull request #11087 from phil235/GirderSinguloPull
...
Girder deconstruction bugfix
2015-08-13 16:33:28 +02:00
9104fd7456
Merge pull request #11107 from Core0verload/bedfix
...
Fixes #11090
2015-08-12 19:43:28 -04:00
eedea4d281
Merge pull request #11018 from Core0verload/hammerspace
...
New traitor item: storage implant
2015-08-12 14:45:23 +01:00
70a8046081
Merge pull request #10815 from bgobandit/bagtags
...
Body bag sprites now update their tag overlay properly.
2015-08-09 02:18:56 +02:00
1f8a439fb2
Fixes bedsheet-capes sprites.
2015-08-09 01:42:36 +03:00
2e5cedef74
Added alien organs
2015-08-09 01:12:32 +03:00
a7b09a84ab
- Made costs and delays variables
...
- Made plasteel multiplier a variable
- Made shocked grilles shock unprotected RCD users
- Made grilles deconstruct instantly to match wirecutters
- Made RCD unable to deconstruct reinforced floors
- Changed canRwall to canRturf to cover both r walls and floors
- Changed large matter cartridge matter amount to 160 so it can still fit in the RCD
- Added fourth matter cartridge to RCD crate so it once again holds enough cartridges to fully load it
2015-08-08 21:18:45 +12:00
866cdbcd34
Fixes plasma cutter firing sound, as well as lack of sound when slicing girder/statues.
...
Rearrange girders.dm
Singularity_pull() no longer unanchors anchored objects (because it breaks the deconstruction of table/girder/states/etc, and make mech pullable by mobs), but it still pulls them.
2015-08-07 23:14:45 +02:00
bd8d70ec26
New traitor item: storage implant
2015-08-04 18:28:38 +03:00
2504affdcf
Better sprites for bed and bedsheets
2015-08-04 15:39:28 +03:00
d5a88d3f98
Merge pull request #10957 from Core0verload/surgery-organs-implants
...
Implants, Surgery and Organs rework: Phase 1
2015-08-04 21:45:02 +10:00
600d424ea5
Moved cyberimplants to internal organs system
2015-08-02 22:28:45 +03:00
0e91f254b9
Fixes a warning during compilation.
...
Removes some unneeded code lines.
2015-08-01 19:46:36 +02:00
3cb8df6e8d
Merge pull request #10948 from SvartaSvansen/disintegrating-airlocks
...
Fixes disintegrating airlocks.
2015-08-01 17:24:21 +02:00
e12d47aab6
Centcom airlock assemblies! No more disintegrating airlocks!
2015-07-31 01:41:02 -04:00
95be17923e
Merge branch 'master' of https://github.com/tgstation/-tg-station into DisposalStuff
...
Conflicts:
_maps/map_files/AsteroidStation/Asteroidstation.dmm
2015-07-30 16:34:39 +02:00
04e74a4ffd
Update girders.dm
2015-07-29 22:29:12 +12:00
2eb50b644a
Fixes small typo in girders.dm
...
Prevented borgs building a false wall
Fixes #10874
2015-07-29 13:22:48 +12:00
34b9a045fc
Fixes non carbon being stunned when thrown and hitting something dense.
...
Fixes being able to enter a disposal bin while buckled.
Fixes items bouncing off delivery chute when thrown into it despite entering the chute.
Fixes being able to leave disposal pipes when moving inside pipes on a janicart.
Fixes some potential runtime (null loc) when flushing the disposal units.
Fixes the thrown range when being ejected from a disposal pipe.
2015-07-26 20:40:46 +02:00
f5ae59a046
Merge pull request #10700 from Ergovisavi/more_fire
...
Molotovs and a throw fix
2015-07-25 20:05:05 +10:00
0d9f7dcb4a
Merge branch 'master' of https://github.com/tgstation/-tg-station into catsandpugs
...
Conflicts:
_maps/map_files/TgStation/tgstation.2.1.3.dmm
2015-07-24 11:58:52 -04:00
ab9668dd3d
Moves update_icon(). Adds crayons.
2015-07-24 09:38:13 -04:00
2e88de4643
Merge branch 'master' of https://github.com/tgstation/-tg-station into bagtags
2015-07-24 02:17:10 -04:00
3ab197f80f
Body bag sprites now update their tag overlay properly.
2015-07-23 20:20:55 -04:00
1d48703c0e
Merge pull request #10778 from bgobandit/babbysfirstcommitwhoawow
...
Fixes some spelling errors and tweaks some fluff text.
2015-07-23 19:45:47 -04:00
fcb081f0e1
(hopefully) fixes merge conflict, adds changelog entry
2015-07-23 11:22:49 -04:00
c0