af51a66e37
Adds sandbags
...
* sandbgs an stuff
* mmmm
* fucking sandbags
* okokok
* aaaaaaaaaaaaaaaaaaaaaah
2016-04-02 23:52:12 -04:00
c3f4f4f9f8
Nar-Sie will now convert girders to cult girders and metal sheets to runed metal sheets
...
* Nar-Sie will now convert girders to cult girders and metal sheets to runed metal sheets
* qdel(qdel())
2016-04-03 13:41:45 +10:00
cb867fe314
Adds a new proc so multiple atoms can be watched for movement
2016-04-02 16:33:56 -03:00
b587496058
Fix locker stuffing
2016-04-02 00:02:50 -03:00
82350431b2
Merge pull request #16439 from KorPhaeron/mecha2
...
Mining Gear Balance
2016-03-31 22:10:07 -04:00
97877c0b2f
Merge pull request #16487 from Supermichael777/BZZZZT
...
Makes Grills ZAP things when shit gets tossed at them.
2016-03-31 01:42:58 -05:00
b525ae0273
I cannot into code too deep
2016-03-30 00:14:14 -04:00
1d3e9b1817
thanks to remie for reminding me to check things
2016-03-30 00:00:11 -04:00
22f42d497a
oooopps
2016-03-29 23:51:18 -04:00
11e0a04f78
BZZZZT
2016-03-29 23:44:52 -04:00
e86cf0f280
praise the good lord, for the game finally compiles
2016-03-29 19:04:37 -06:00
3f1375ba39
Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs
...
Conflicts:
_maps/RandomZLevels/Cabin.dmm
_maps/RandomZLevels/beach2.dmm
_maps/RandomZLevels/caves.dmm
_maps/RandomZLevels/research.dmm
_maps/RandomZLevels/snowdin.dmm
_maps/RandomZLevels/undergroundoutpost45.dmm
_maps/map_files/DreamStation/dreamstation04.dmm
_maps/map_files/EfficiencyStation/EfficiencyStation.dmm
_maps/map_files/MetaStation/MetaStation.v41I.dmm
_maps/map_files/MiniStation/MiniStation.dmm
_maps/map_files/TgStation/tgstation.2.1.3.dmm
_maps/map_files/generic/z4.dmm
_maps/templates/lavaland_surface_automated_trade_outpost.dmm
_maps/templates/lavaland_surface_biodome_winter.dmm
_maps/templates/lavaland_surface_prisoner_crash.dmm
_maps/templates/lavaland_surface_seed_vault.dmm
code/controllers/subsystem/air.dm
code/game/asteroid.dm
code/game/atoms.dm
code/game/gamemodes/nuclear/nuclearbomb.dm
code/game/machinery/computer/arcade.dm
code/game/objects/effects/aliens.dm
code/game/objects/effects/overlays.dm
code/game/objects/items/apc_frame.dm
code/game/objects/structures/false_walls.dm
code/game/objects/structures/girders.dm
code/game/turfs/simulated.dm
code/game/turfs/simulated/floor/fancy_floor.dm
code/game/turfs/simulated/floor/mineral_floor.dm
code/game/turfs/simulated/floor/plating.dm
code/game/turfs/simulated/river.dm
code/game/turfs/simulated/walls_misc.dm
code/game/turfs/simulated/walls_reinforced.dm
code/modules/admin/verbs/buildmode.dm
code/modules/atmospherics/environmental/LINDA_turf_tile.dm
code/modules/events/spacevine.dm
code/modules/flufftext/Hallucination.dm
code/modules/holodeck/turfs.dm
code/modules/mining/mine_items.dm
code/modules/mining/mine_turfs.dm
code/modules/mob/interactive.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/living.dm
code/modules/mob/living/simple_animal/bot/floorbot.dm
code/modules/mob/living/simple_animal/guardian/guardian.dm
code/modules/mob/living/simple_animal/hostile/hostile.dm
code/modules/mob/mob_movement.dm
code/modules/power/singularity/narsie.dm
code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm
code/modules/research/server.dm
2016-03-29 14:46:06 -06:00
b9950c4358
turf/open and turf/closed
2016-03-29 13:38:56 -06:00
53fac5b31d
Ruins mining
2016-03-29 03:09:59 -05:00
32ef4ffe0a
Optimizations, statue changes
2016-03-26 21:24:10 -04:00
cc62b89baf
Fix bundle
2016-03-26 15:15:31 -04:00
c6ab8b0041
Merge pull request #16165 from ChangelingRain/cultlock
...
Nar-Sie will now corrupt airlocks, tables, windows, and windoors
2016-03-19 21:58:12 -05:00
5823fda099
Merge pull request #16145 from Incoming5643/girder_your_loins
...
Deinforces reinforced girders
2016-03-17 17:36:10 -05:00
f7a2348ef7
Nar-Sie will now corrupt doors, tables, windows, and windoors
2016-03-17 16:28:26 -04:00
76972d385a
The reenforced girders ex_act values have been boosted. They were previously harder to destroy with low level explosions than the R-walls they're built into
...
R-Wall
ex_act(1): 100% ripped to space
(2): 50% replaced with r-girder else ripped to plating
(3): 10% replaced with r-girder
Old R-girder
ex_act(1): 100% destroyed
(2): 30% destroyed
(3): 5% destroyed
New R-grider
ex_act(1): 100% destroyed
(2): 50% destroyed
(3): 20% destroyed
2016-03-16 18:40:57 -04:00
0288f7c592
Merge pull request #16067 from xxalpha/silky_smooth
...
icon smooth ss
2016-03-15 04:59:48 -05:00
688137c7dc
icon smooth ss
...
adjustments
adjustements
atharrachaidhean
2016-03-12 23:57:45 +00:00
8701541d20
Fixes not being able to unbuckle from surgery tables
2016-03-12 21:44:45 +01:00
f3ecb132ba
Adds Alien Alloys
2016-03-12 15:06:03 +03:00
5420596dd0
Merge pull request #15819 from xxalpha/october_12th_2555
...
Detective can be a traitor/double agent.
2016-03-11 12:50:32 -06:00
12a6205372
Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs
...
Conflicts:
_maps/RandomRuins/SpaceRuins/asteroid4.dmm
_maps/RandomRuins/SpaceRuins/spacebar.dmm
_maps/RandomZLevels/Academy.dmm
_maps/RandomZLevels/beach.dmm
_maps/RandomZLevels/caves.dmm
_maps/RandomZLevels/research.dmm
_maps/RandomZLevels/snowdin.dmm
_maps/RandomZLevels/spacebattle.dmm
_maps/RandomZLevels/undergroundoutpost45.dmm
_maps/RandomZLevels/wildwest.dmm
_maps/map_files/AsteroidStation/AsteroidStation.dmm
_maps/map_files/BirdStation/BirdStation.dmm
_maps/map_files/DreamStation/dreamstation04.dmm
_maps/map_files/DreamStation/z5.dmm
_maps/map_files/EfficiencyStation/EfficiencyStation.dmm
_maps/map_files/MetaStation/MetaStation.v41I.dmm
_maps/map_files/MiniStation/MiniStation.dmm
_maps/map_files/TgStation/tgstation.2.1.3.dmm
_maps/map_files/generic/z4.dmm
_maps/map_files/generic/z5.dmm
_maps/map_files/generic/z6.dmm
_maps/templates/lavaland_surface_prisoner_crash.dmm
_maps/templates/lavaland_surface_seed_vault.dmm
_maps/templates/lavaland_surface_ufo_crash.dmm
code/game/asteroid.dm
code/game/atoms.dm
code/game/gamemodes/cult/runes.dm
code/game/gamemodes/malfunction/Malf_Modules.dm
code/game/machinery/computer/arcade.dm
code/game/objects/structures/lattice.dm
code/game/turfs/simulated/floor/fancy_floor.dm
code/game/turfs/simulated/floor/misc_floor.dm
code/game/turfs/simulated/floor/plasteel_floor.dm
code/game/turfs/simulated/walls_misc.dm
code/game/turfs/turf.dm
code/modules/events/spacevine.dm
code/modules/mining/mine_turfs.dm
code/modules/mob/living/living.dm
code/modules/mob/living/silicon/robot/robot.dm
code/modules/mob/living/simple_animal/bot/cleanbot.dm
code/modules/mob/living/simple_animal/bot/mulebot.dm
code/modules/mob/mob_movement.dm
2016-03-10 23:07:21 -06:00
5bf31463da
removes simulated turfs; adds space gas mixture for space
2016-03-10 17:27:01 -06:00
e43b3a891d
Merge pull request #15964 from RemieRichards/buckle_many_mobs
...
Many Buckled Mobs
2016-03-10 08:22:27 -06:00
57493aa426
Merge pull request #15855 from kilkun/master
...
New Human Species Datum
2016-03-08 21:39:46 -06:00
1bfa6cf742
Removes species from magic mirrors
2016-03-08 22:24:24 -05:00
4e821d8657
Atoms may now have many mobs buckled to them, as opposed to one, this is controlled by the new max_buckled_mobs var on atoms, defaults to 1 as to not change any current functionality
2016-03-07 18:03:25 +00:00
e6c0cd286f
Attempts to fix lattices not GCing sometimes
2016-03-05 14:01:06 -03:00
2389fd0b01
Merge pull request #15899 from phil235/ResistandGrabFixes
...
Fixes being able to resist while dead.
2016-03-04 22:14:35 -03:00
c76f48e817
derp
2016-03-03 21:08:19 +01:00
15d8e0a96f
I refactored how a mob resisting out of a closet that is itself inside something is done.
...
Fixes not being able to resist out of an unlocked unwelded locker. Now both moving and the resist button work (except for the cardboard box).
You can no longer spam breakingout message ouf of a closet by moving while inside.
Wrapping and unwrapping a locker no longer unwelds it magically.
I refactored closet/crate/item package wrapping.
You can packagewrap belts and other storage items in which the package wrap item doesn't fit.(it does currently have the unintended side effect of giving you the "doesn't fit in X" message when wrapping there storage items though).
2016-03-03 20:20:34 +01:00
0d8c212322
RPD
2016-03-03 03:58:13 -06:00
2bb41cd5b3
Merge remote-tracking branch 'refs/remotes/tgstation/master' into control_wand
...
# Conflicts:
# code/game/objects/structures/crates_lockers/closets/secure/security.dm
2016-03-01 19:18:29 -06:00
41a42922d2
Merge pull request #15709 from Malkevin/cuffsandclean
...
Cuffs and sec clean up
2016-03-01 20:28:56 -03:00
24e3d569f8
Door remotes
2016-03-01 01:43:12 -06:00
6ce6e4f004
Removed Detective's access to security lockers and secbots.
...
wrong access
2016-02-29 00:42:30 +00:00
9716d1f861
Merge pull request #15787 from KazeEspada/treefixes
...
Tree Fixes
2016-02-28 21:13:48 -03:00
77b7f02bdd
Merge pull request #15775 from AnturK/fix1
...
Bunch of fixes
2016-02-27 21:27:08 -03:00
81f60f84f0
fixed an edgecase where you could spam cut a tree and receive multiple logs.
2016-02-26 23:46:09 -07:00
59774fc0fb
Fixes some other ghost interaction issues.
2016-02-26 23:13:13 +01:00
2dfebaa77e
Merge pull request #15708 from KorPhaeron/sins
...
Five lavaland ruins
2016-02-26 08:46:32 -06:00
d80756ce9e
Merge pull request #15745 from KazeEspada/TreeCutting
...
Tree cutting
2016-02-26 08:40:29 -06:00
2d9619446f
Merge pull request #15733 from phil235/ClosetAIFix
...
The AI's core no longer fits inside regular closets
2016-02-26 08:37:57 -06:00
ee42b2d051
Merge pull request #15652 from lordpidey/wallbuildfix
...
Fixes inability to construct walls with shuttlemetal
2016-02-25 15:29:58 -03:00
8aeb2678e0
You can now cut down trees! You can use anything sharp to do so, and it will produce 10 logs. The more force the item has, the faster it cuts.
2016-02-24 23:15:19 -07:00
3ea7cf9831
The AI's core no longer fits inside regular closets (but still fits inside bluespace bodybag).
...
Ghosts and camera mobs no longer get inserted inside closets.
Fixes an error in alien nest code.
2016-02-24 22:56:54 +01:00
bawhoppen
Joan Lung
Lzimann
Cheridan
Supermichael777
duncathan
KorPhaeron
Xhuis
Incoming
xxalpha
AnturK
c0
KorPhaeron
kilkun
Remie Richards
Tkdrg
phil235
phil235
KazeEspada