Fox-McCloud
|
9ed89ef7cd
|
Fixes Stack Merge Oddities
|
2017-03-24 04:44:04 -04:00 |
|
Fox McCloud
|
b0dc4ccab2
|
Merge pull request #6738 from uraniummeltdown/shadowshroom
Shadowshrooms + Glowshroom Nerf + Station Lighting Nerf
|
2017-03-23 12:39:36 -04:00 |
|
uraniummeltdown
|
0f5c0e40e2
|
nerf station lighting along with shadowshroom glow power, fix shroom spreading, endurance fix
|
2017-03-23 14:12:17 +04:00 |
|
Fox McCloud
|
d62e35d333
|
Merge pull request #6647 from Kyep/nerf_chaplain
Nerfs Validhunting Chaplains
|
2017-03-23 00:18:16 -04:00 |
|
Crazy Lemon
|
a3df2d2eb5
|
Merge pull request #6851 from Fox-McCloud/cleaning
Spring Cleaning
|
2017-03-22 21:16:52 -07:00 |
|
Fox McCloud
|
2844a024ab
|
Merge pull request #6853 from KasparoVy/stuff
Fixes #6842, #6840 and #6839
|
2017-03-22 17:17:32 -04:00 |
|
FlattestGuitar
|
c1fcb9a87c
|
<
|
2017-03-22 09:24:03 +01:00 |
|
KasparoVy
|
1cbe9d0bb6
|
Beds now return 2 metal when deconstructed.
Removes unnecessary src.
|
2017-03-21 16:45:55 -04:00 |
|
Fox McCloud
|
9444666c18
|
Merge pull request #6818 from KasparoVy/deadlier-nuke
Nuke kills everybody (On the station Z-level).
|
2017-03-21 15:08:54 -04:00 |
|
Fox-McCloud
|
037db0bdf7
|
Spring Cleaning
|
2017-03-21 14:43:53 -04:00 |
|
Fox McCloud
|
8a257e425e
|
Merge pull request #6789 from uraniummeltdown/playball
Baseball Bats, Baseball Burgers
|
2017-03-21 14:38:03 -04:00 |
|
Fox McCloud
|
472bd7b887
|
Merge pull request #6813 from SamHPurp/fixes-vent-text
Fixes
|
2017-03-20 16:39:10 -04:00 |
|
Sam
|
e43cb810a8
|
More bits wew.
|
2017-03-20 06:37:56 +00:00 |
|
Sam
|
343d466287
|
Reverts NanoTrasen edits following convo with Fox/Regen
|
2017-03-19 21:31:42 +00:00 |
|
KasparoVy
|
1c556648c6
|
Keeping up with the Jones.
Nukeproof fridges.
|
2017-03-19 05:49:07 -04:00 |
|
Sam
|
3b166bcb97
|
Fixes formatting issue ( Thanks @Tigercat2000 )
|
2017-03-19 04:29:18 +00:00 |
|
Sam
|
4f4e749b83
|
Fixes infinite production of cable coil
|
2017-03-19 04:25:41 +00:00 |
|
Sam
|
d5d3fdfc84
|
Fixes typos, and changes a name to bring it inline with the rest of the assemblies
|
2017-03-19 03:54:45 +00:00 |
|
Sam
|
db89c499ce
|
Fixes some capitalisation stuff...
Pedantry!
|
2017-03-19 01:09:47 +00:00 |
|
uraniummeltdown
|
cd6b6a61d7
|
added dog beds craftable from 10 wood planks
|
2017-03-17 17:46:04 +04:00 |
|
uraniummeltdown
|
5180002295
|
add baseball bat item for 5 wood sheets, baseball burger, admin only reflector bat and homerun bat
|
2017-03-16 22:33:24 +04:00 |
|
uraniummeltdown
|
b686cad0ce
|
robo hands aren't affected by shard cutting into hand
|
2017-03-16 16:20:46 +04:00 |
|
uraniummeltdown
|
6ca139974d
|
glass shards now deal brute to your hand if not wearing gloves
|
2017-03-15 19:39:54 +04:00 |
|
Fox McCloud
|
6bfd4013c0
|
Merge pull request #6753 from uraniummeltdown/grilles
Grille Code Update
|
2017-03-15 07:48:17 -04:00 |
|
Fox McCloud
|
c6e3fe3cdb
|
Merge pull request #6734 from uraniummeltdown/plastic
Plastic is not a mineral anymore, plastic flaps can be constructed/deconstructed
|
2017-03-15 06:33:02 -04:00 |
|
uraniummeltdown
|
0fc0aac229
|
remove target argument from ex_act()
|
2017-03-14 15:20:33 +04:00 |
|
Crazy Lemon
|
4edee61021
|
Merge pull request #6739 from Kyep/gateway_wildwest_mines
Stops Wild West syndie mobs killing themselves with their own mines
|
2017-03-13 13:14:34 -07:00 |
|
uraniummeltdown
|
70c2a27d16
|
Merge branch 'master' into grilles
|
2017-03-12 16:52:13 +04:00 |
|
uraniummeltdown
|
2af6b1de23
|
grille code updates from tg, removed attack_self() from rods they now use recipes, refactored grille (de)construction, added broken grille object for mapping, grilles can be damaged by throwing objs or mobs at them, also general code cleanup
|
2017-03-12 16:35:24 +04:00 |
|
Fox McCloud
|
1a23c8a199
|
Merge pull request #6746 from Markolie/zefix
Fixes
|
2017-03-12 03:42:06 -04:00 |
|
Fox McCloud
|
0fe2a135e4
|
Merge pull request #6728 from FlattestGuitar/click
Adds clicks to flashlights 🔦
|
2017-03-11 21:26:23 -05:00 |
|
uraniummeltdown
|
85260a72ba
|
plastic is not a mineral anymore, plastic flaps are deconstructible, new construction.dm construction defines
|
2017-03-12 06:09:29 +04:00 |
|
Crazy Lemon
|
661939c145
|
Merge pull request #6691 from davipatury/rcl
Port's RCL from /vg/
|
2017-03-11 15:30:48 -08:00 |
|
Markolie
|
5c20a29b1d
|
Fix statue welding, fix firedoor message spam, fix slaughter candidate pick
|
2017-03-11 18:25:23 +01:00 |
|
Kyep
|
b6b1b3c0aa
|
Stops Wild West syndie mobs blowing themselves up on their own mines
🆑 Kyep
fix: Syndicate mobs in the Wild West are no longer so stupid that they
trip over, and die to, their own mines.
/🆑
|
2017-03-11 02:11:33 -08:00 |
|
Fox McCloud
|
3c7d990061
|
Merge pull request #6710 from uraniummeltdown/coverflags
Cleaned up clothing flags
|
2017-03-11 04:57:15 -05:00 |
|
Fox McCloud
|
d6da6e3f52
|
Merge pull request #6527 from davipatury/modular_computers
Port's TG's modular computers
|
2017-03-11 04:51:49 -05:00 |
|
uraniummeltdown
|
658e0f6a82
|
adds shadowshrooms from tgstation, nerf glowshroom glow a bit and add new vars for glow, add new shadow and red light genes
|
2017-03-11 13:36:04 +04:00 |
|
uraniummeltdown
|
9eb7eea1e9
|
removes fourth argument air_group of CanPass() as it's not used and is a leftover from FEA
|
2017-03-10 22:46:02 +04:00 |
|
FlattestGuitar
|
8c9b1ab043
|
Adds clicks to flashlights
|
2017-03-10 17:21:09 +01:00 |
|
Markolie
|
a6a7cf9d36
|
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into zefix
# Conflicts:
# _maps/map_files/cyberiad/cyberiad.dmm
# code/game/jobs/job/job.dm
|
2017-03-10 12:42:37 +01:00 |
|
uraniummeltdown
|
dd12fbe13a
|
new flags_cover var for clothes, adjust existing flags
|
2017-03-10 11:33:42 +04:00 |
|
Fox McCloud
|
9510fa9f6c
|
Merge pull request #6711 from Crazylemon64/playercreation_assembly_line
Streamlines the ghost-to-player creation process
|
2017-03-09 21:30:22 -05:00 |
|
Mark van Alphen
|
93470e3570
|
Merge branch 'master' into zefix
|
2017-03-09 17:20:31 +01:00 |
|
davipatury
|
2a9bcde361
|
Fix conflicts.
|
2017-03-09 12:01:50 -03:00 |
|
Crazylemon64
|
38dc304e54
|
Adds nitpick and allows for transformer rotation
No actual sprites for the latter, so it's kind of doofy, but oops
|
2017-03-08 19:04:19 -08:00 |
|
davipatury
|
781e66ec52
|
Fix conflicts.
|
2017-03-08 12:57:45 -03:00 |
|
davipatury
|
2ac164812c
|
Fox's suggestions.
|
2017-03-08 12:04:19 -03:00 |
|
Crazylemon64
|
869c9b76c4
|
Streamlines the ghost-to-player creation process
Also refactors ERT equipment to be actual outfits instead of hardcoded
|
2017-03-08 05:49:49 -08:00 |
|
Markolie
|
acab5d5170
|
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into toolz
# Conflicts:
# code/game/objects/items/weapons/storage/bags.dm
# code/game/objects/items/weapons/storage/uplink_kits.dm
# code/game/objects/items/weapons/storage/wallets.dm
|
2017-03-08 10:45:16 +01:00 |
|