uraniummeltdown
3df3688e72
move all crates to crates.dmi
2017-02-11 17:44:20 +04:00
Markolie
915ff13bfb
Add Lavaland reagents, fix mine lamp luminosity
2017-01-20 23:35:56 +01:00
Markolie
01f2c85347
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
...
# Conflicts:
# code/__DEFINES/misc.dm
# code/game/dna/genes/goon_powers.dm
# code/game/dna/genes/vg_powers.dm
# code/game/objects/effects/overlays.dm
# code/game/objects/structures/crates_lockers/closets.dm
# code/game/objects/structures/crates_lockers/closets/statue.dm
# code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
# icons/mob/back.dmi
# icons/obj/storage.dmi
2016-12-23 19:32:19 +01:00
Crazylemon64
6d3e66f41c
Polishes up the reset_view proc, which is basically
...
`reset_perspective` from tgstation.
Also adds various support for remote viewing lenses - like cameras not
transmitting xray vision, among other things
Recommit because we're using different compiler versions
2016-12-21 17:56:57 -08:00
Markolie
f61cfb47b9
Part three: The Hierophant. Also minor fixes for the other bosses.
2016-10-24 21:39:40 +02:00
Markolie
e853b66747
Minor wall deconstruction refactor
2016-10-21 17:05:49 +02:00
Fox-McCloud
f4db89eb88
full desconstruction
2016-08-21 19:56:49 -04:00
Fox-McCloud
137af9a5a9
fixups
2016-08-21 18:17:54 -04:00
Fox-McCloud
8cd6e58c07
updates
2016-08-21 11:44:54 -04:00
Fox-McCloud
43889a89d5
Ports Mining Shelters
2016-08-21 03:14:08 -04:00
Fox-McCloud
e6c02e3a2c
Merge remote-tracking branch 'upstream/master' into mining-tweaks
2016-07-15 23:16:00 -04:00
Fox-McCloud
0fb2bfd8f1
Various Mining Tweaks
2016-07-14 22:07:04 -04:00
Fox-McCloud
cb111fbec4
tweak
2016-07-13 19:14:57 -04:00
Fox-McCloud
3acce26982
Fantastic PR
2016-07-12 18:21:02 -04:00
monster860
3df85518e1
Removes .0 at the end of w_class numbers
2016-07-08 12:26:34 -04:00
Tigercat2000
c72cc9606e
Merge remote-tracking branch 'upstream/master' into to_chat
...
Conflicts:
code/modules/research/xenobiology/xenobiology.dm
2016-04-05 15:54:48 -07:00
Tigercat2000
78f53553f8
Reduce lines by removing blank lines added by PJ's script
2016-04-05 08:25:57 -07:00
Tigercat2000
9d430844c3
Replace most (if not all) output << operators with to_chat(user, message)
...
Currently, to_chat is literally just a proc that does user << message.
But it'll let us do output modification in the future, especially for
something like Goon's HTML chat.
Big thanks to PJB for his to_chat script, see
https://github.com/d3athrow/vgstation13/pull/6625 for more details.
2016-04-05 08:15:05 -07:00
Tastyfish
16c8e24f04
Tweaks/fixes some bot radio/language stuff, lazarus capsules
2016-04-04 02:02:19 -04:00
Fox-McCloud
488af2ac7a
Gives Mining Drills and Edge
2016-03-06 04:33:21 -05:00
Spacemanspark
5aa671b630
Fixes indents.
2016-02-09 01:41:22 -06:00
Spacemanspark
b6b3204bf7
Makes Mob Capsule code better.
2016-02-09 01:02:25 -06:00
Spacemanspark
24afe14a12
Adds in mob capsules
2016-02-08 23:40:53 -06:00
Tigercat2000
0e3c1f7fc6
Merge remote-tracking branch 'upstream/master' into I_WILL_FUCKING_NUKE_THIS_GODDDDAMMMNIIITTT
2015-12-13 09:25:04 -08:00
Fox-McCloud
068bfd10ba
TG Mining Update
2015-12-10 21:35:02 -05:00
Tigercat2000
42aa800393
Merge remote-tracking branch 'upstream/master' into I_WILL_FUCKING_NUKE_THIS_GODDDDAMMMNIIITTT
...
Conflicts:
code/game/supplyshuttle.dm
code/modules/mining/laborcamp/laborshuttle.dm
2015-12-09 10:08:28 -08:00
Certh
591daf04d2
Corrected the capitalization of a large amount of machines and items. This will also cause BYOND to use the correct articles (a/an).
...
Also corrected some periods, spelling errors etc. along the way.
If this PR seems familiar, a part of this is of an earlier PR that I messed up.
2015-12-07 16:14:26 +01:00
Tigercat2000
e60799474b
tgshuttles unfinished
2015-12-03 10:59:06 -08:00
Fox-McCloud
25c35343dc
materials-consitency
2015-09-12 16:22:39 -04:00
Fox-McCloud
a019934e9e
Pass I
2015-09-04 05:18:48 -04:00
DZD
51eca017ad
Fixes based on feedback
2015-07-29 18:39:54 -04:00
DZD
d4cf433e7c
Various fixes, changes, additions, and removal of old features.
...
More changes
2015-07-10 19:41:27 -04:00
DZD
b94c3deaf2
Initial Commit for -tg- Mining
...
I can guarantee this will not compile, very much a WIP and currently
consists of mostly copy+pasting -tg-'s modules/mining folder over ours,
and unticking a few of our own files.
2015-07-08 16:19:26 -04:00
Tigercat2000
e1249fc640
Lighting overhaul.
...
This commit overhauls the lighting system to Bay12 standards. It is better
in pretty much every way.
2015-05-10 12:03:27 -07:00
Fox-McCloud
dec621eefd
Revert "R&D Research Levels Unification"
2015-04-07 01:16:19 -04:00
jack-fractal
a0be969870
Unifying tech levels
...
Unifies tech levels between design and their products.
2015-04-06 22:07:44 -04:00
Fox-McCloud
4e4e7ae77f
Crayons and Gloves
2015-03-06 21:40:57 -05:00
DZD
4bcdb94a99
Merge with upstream/master
...
Fixes conflicts
2015-02-18 13:41:32 -05:00
Fox-McCloud
a03879d83f
Sound Updates
2015-02-16 16:29:43 -05:00
DZD
b3a0c9a975
Removes TABLEPASS and FPRINT flags
...
- Also adds ABSTRACT and NODROP flags in preparation for removal of
canremove and abstract vars.
- Sorts some of the setup.dm flags so they're in order.
- Replaces 'flags & 2' in policetape.dm with pass_flags & PASSTABLE,
should have the same effect.
2015-02-10 17:41:37 -05:00
Fox-McCloud
be1d527069
Borg Modules
2015-01-10 21:41:41 -05:00
Fox-McCloud
525bb1a96f
Stun Changes
2014-12-30 12:30:14 -05:00
melandor0
01cc6409e7
supermatter drill
...
New traitor item
2014-11-06 19:28:34 +01:00
mwerezak
6ada0cf263
Adds sharp and edge flags to appropriate items
...
Went through as many /obj/item/weapons as I could find and added sharp
and edge flags where appropriate.
Conflicts:
code/modules/research/xenoarchaeology/finds/finds_misc.dm
2014-06-17 07:08:25 -04:00
Zuhayr
e4b95aa05e
Moved engineering, research and mining shuttles to a generalized system with its own directory structure.
...
Conflicts:
baystation12.dme
code/modules/mining/mine_items.dm
code/modules/research/research_shuttle.dm
2014-06-14 02:01:14 -04:00
mwerezak
418ba281d7
Fixes circuit var for other consoles
...
Also cleans up attackby while we're at it.
Conflicts:
code/game/dna/dna_modifier.dm
code/game/machinery/computer/arcade.dm
code/game/supplyshuttle.dm
code/modules/mining/mine_items.dm
code/modules/reagents/Chemistry-Machinery.dm
code/modules/research/research_shuttle.dm
code/modules/research/server.dm
2014-05-26 06:21:03 -04:00
ESwordTheCat
c43652b33a
Okay shards converted to pool usage now.
...
Conflicts:
code/game/machinery/computer/arcade.dm
code/game/machinery/doors/windowdoor.dm
code/game/machinery/telecomms/traffic_control.dm
code/game/objects/structures/displaycase.dm
code/modules/mining/mine_turfs.dm
code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm
2014-04-19 19:57:53 -04:00
Rob Nelson
9227481a8a
Standardize windows.
...
Conflicts:
code/WorkInProgress/buildmode.dm
code/game/machinery/doors/airlock.dm
code/game/objects/items/stacks/sheets/glass.dm
code/game/objects/items/weapons/twohanded.dm
code/game/objects/structures/window.dm
code/modules/mining/mine_items.dm
code/modules/mob/living/carbon/metroid/metroid.dm
code/modules/mob/living/simple_animal/constructs.dm
code/modules/mob/living/simple_animal/friendly/corgi.dm
2014-04-19 19:36:33 -04:00
Zuhayr
0f0ac218b3
Commented out blob and wish granter.
2013-08-03 12:51:41 -07:00
Ispil
4c1bb073ff
Fixes issue #2872 , partially. Carp are now smashed by shuttles if they don't get pushed out of the way. However, they can still end up in grille-windows, giving more motivation to replace them in shuttles with actual shuttle windows. Also gibs other simple_animal creatures that are in the way.
2013-07-04 04:55:24 -07:00
