be3f372680
Merge pull request #8788 from PsiOmegaDelta/PortedSpells
...
Ports /vg/'s spell system for use by the cult port.
2015-04-11 02:05:58 +03:00
1ba8dcbca9
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/machinery/vending.dm
2015-04-10 15:25:34 +02:00
990530d118
Ports /vg/'s spell system for the sake of cult porting.
...
Does offer a much more pleasant basis to work with in the future, if someone wishes to add more spell-like abilities.
2015-04-09 20:08:06 +02:00
a377806b47
Fixes PACMAN UI initial data
...
Fixes #8561
2015-04-09 15:58:07 +01:00
398459c2e7
Merge remote-tracking branch 'upstream/dev' into inventoryfix
...
Conflicts:
code/modules/organs/organ_external.dm
2015-03-31 02:13:22 -04:00
9b2f5cea33
Merge remote-tracking branch 'upstream/dev' into inventoryfix
...
Conflicts:
code/game/gamemodes/revolution/rp-revolution.dm
code/game/machinery/kitchen/juicer.dm
code/game/objects/items/stacks/stack.dm
code/game/objects/items/weapons/cigs_lighters.dm
code/game/objects/structures/stool_bed_chair_nest/stools.dm
code/modules/destilery/main.dm
code/modules/hydroponics/biogenerator.dm
code/modules/mob/living/carbon/human/inventory.dm
code/modules/mob/living/carbon/monkey/inventory.dm
code/modules/projectiles/guns/launcher/pneumatic.dm
2015-03-31 01:37:55 -04:00
cdfce64ad0
Replaces uses of u_equip() with remove_from_mob() or drop_from_inventory(), where appropriate.
2015-03-30 22:05:00 -04:00
601e6fb7ef
Merged with dev.
2015-03-31 11:17:13 +10:30
1b4e13aabc
Removes unnecessary and cruft procs from mob/inventory.dm
2015-03-30 05:28:09 -04:00
d77010221c
Merge with dev.
2015-03-30 08:36:52 +10:30
1a000b0e0f
Merge remote-tracking branch 'upstream/dev' into NarsiePort
...
Conflicts:
code/modules/mob/living/carbon/human/say.dm
2015-03-29 13:04:53 +02:00
464d702d4b
Mob refactoring.
...
Updates Bump() code.
Intents now use constants.
Simple animals can now use languages without overriding say().
There is now a difference between being able to smash normal and reinforced walls.
Reworks simple_animal/attackby so that constructs don't need to override it simply to add damage resistance.
2015-03-29 10:44:31 +02:00
c0887333bc
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev-freeze
2015-03-27 11:13:53 +10:30
aa6439096c
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into limbs
2015-03-26 23:25:26 +10:30
dda3fc8f02
Merge pull request #8469 from mwerezak/robot-emp
...
Reduces the effect of EMP on robot power cells, some other things
2015-03-26 19:00:39 +10:30
97112c8a4c
Replaced display_name with name, worked on severing limbs and damage propagation.
2015-03-25 19:07:22 +10:30
d26800d29c
Preliminary work on converting all monkeys to a human subspecies.
2015-03-25 02:15:45 +10:30
3fe4162719
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into limbs
2015-03-25 00:29:59 +10:30
89965420bb
Merge pull request #8603 from Baystation12/dev-freeze
...
Dev freeze
2015-03-24 14:00:57 +01:00
b9072baa97
Merge with dev.
2015-03-24 14:41:07 +10:30
45f28d5372
Fixes #8485
2015-03-24 13:20:24 +10:30
f8eb5ccb97
indent fix
2015-03-23 13:04:39 -04:00
28df26b36c
Reduces the effect of EMP on robot power cells
...
Temporary fix to resolve #8454
2015-03-23 02:34:17 -04:00
98da191ac3
Gamemode refactor, lots of code shuffles, PR will have details.
2015-03-21 11:08:17 +10:30
e0f23aead5
Collapsed all organs into one object type. Added more interesting amputation. Added dislocation. WIP.
2015-03-11 21:17:51 +10:30
11d340f898
Projectile effects - Part 3
...
- Fixes for turrets, rogue drones, and emitters
- Removed muzzle flash from chem darts
- Converted emitters to use spanclasses and have correct capitalization
2015-03-09 22:17:34 +13:00
c9a2ed84fe
Merge pull request #8352 from PsiOmegaDelta/LessEdits
...
Mappings.
2015-03-05 09:20:03 +10:30
f229aa479f
Adds a bunch of prettiness to the TEG, fixes a runtime.
2015-03-04 09:13:05 -05:00
81b0ab3bcf
Mappings.
...
Makes specific instances of the engine room air alarm and AI APC.
Includes some map cleanup by Dream Maker itself.
2015-03-04 10:21:36 +01:00
2c032cacaf
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-02-27 09:52:51 +01:00
7e498e1cf7
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/hydroponics/seed_datums.dm
code/modules/hydroponics/trays/tray_apiary.dm
code/modules/power/apc.dm
code/setup.dm
2015-02-27 09:06:48 +01:00
488c25ae73
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into outpost-power
2015-02-24 13:09:05 +01:00
93b049e7a6
Alarm centralization completion
...
Ensures the master area is always used, to avoid issues caused by dynamic lightning which splits areas into sub-areas.
Power alarms now handled centrally.
2015-02-23 11:23:23 +01:00
228651be1c
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into outpost-power
2015-02-23 08:03:57 +01:00
657028026a
Fixes APC emp_act()
...
Now properly handles the channel changes.
2015-02-21 14:55:13 -05:00
81599a9203
Merge pull request #8175 from Kelenius/ofBorgsAndSynths
...
Adds robot synths
2015-02-21 11:43:39 +03:00
dca82ef90d
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into outpost-power
2015-02-20 12:38:03 +01:00
a0b73140e9
Fixes for synths and decompiler
2015-02-20 13:32:10 +03:00
1c1e644f29
Adds robot synths
2015-02-19 21:04:27 +03:00
57ffdc82f6
Replaces stool structures with stool items
2015-02-18 01:06:00 -05:00
2d4926f72d
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into outpost-power
2015-02-17 16:05:47 +01:00
06335b1064
The AI now has a personal power monitor interface.
2015-02-16 15:12:23 +01:00
f9ba327c3a
Merge pull request #8099 from mwerezak/gun-rewrite
...
Gun rewrite
2015-02-16 11:54:52 +03:00
2ebf834b9b
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
2015-02-15 22:37:55 +08:00
cc62c987ea
Some TEG refactoring and UI improvements
...
"circulator/heat exchanger" is now just called "circulator"
2015-02-13 18:34:48 +08:00
71902cdca2
Tweaked descriptions and settings of various TEG components.
...
Maximum power of core vent and injector increased.
2015-02-13 16:08:52 +08:00
0d89717cf2
Merge remote-tracking branch 'upstream/dev' into gun-rewrite
...
Conflicts:
code/modules/projectiles/ammunition/boxes.dm
code/modules/projectiles/guns/projectile/pistol.dm
2015-02-13 01:57:19 -05:00
98dd5c46c0
Circulators now draw air based on the total volume of the pipe network connected to the input. They also generate some power in the same manner as pipe turbines.
...
Thermoelectric generators now generate much more power, mostly due to the increase in circulator intake volume.
Supermatter no longer powers radiation collectors, and is tweaked to run at 4000-6000K.
TEG supermatter engine mapped in. Currently generates ~1MW of power with chamber temperature of 5000K.
2015-02-13 00:38:23 +08:00
a8089d4437
Merge master into dev.
2015-02-12 23:01:08 +10:30
5b5e16916f
Replaces text expressions with macros
2015-02-12 01:55:12 -05:00
Chinsky