tigercat2000
ce18ecdbbf
Merge pull request #8543 from IK3I/I-SAID-CANCEL!
...
Some Fixes and Usability Stuff
2018-01-24 15:41:36 -08:00
uraniummeltdown
8fd3a5e890
move cult effects to their own file
...
move cult beams to beam.dmi
2018-01-16 23:38:36 +05:00
IK3I
d57622b460
NARSIE SAYS LEAVE!
...
* Shuttles now properly respect the intentions of eldritch horrors
* Comms consoles will tell you when the shuttle can't be recalled
instead of just saying nope
* Admemes can now designate if their shuttles are recallable when they
call them
2018-01-11 11:41:04 -06:00
uraniummeltdown
75e177b7a9
renames receive_damage() for animations to receiving_damage()
...
renames take_damage() for organs to receive_damage()
renames Deconstruct() to deconstruct() for atmos objects
obj_integrity, max_integrity, integrity_failure vars moved to /obj level, obj_integrity = max_integrity on New()
2017-12-28 00:32:54 +05:00
tigercat2000
48d78b4648
Merge pull request #7832 from Fox-McCloud/lungsss
...
Breathing is Now Handled on Lungs
2017-12-01 17:51:19 -08:00
Fox-McCloud
6ec234430e
Merge remote-tracking branch 'upstream/master' into lungsss
...
# Conflicts:
# code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
# code/modules/mob/living/carbon/carbon_defines.dm
2017-11-18 18:49:47 -05:00
uraniummeltdown
7ed2c68ea7
compiles, find and replace particle_effect and effect_system
2017-11-04 20:16:01 +04:00
uraniummeltdown
a0939ca93b
finish making smoke OOP, compiles
2017-11-03 22:46:49 +04:00
uraniummeltdown
bca9b79374
new pacman portable generator sprites
2017-09-30 12:15:11 +04:00
tigercat2000
bf3f968c6f
Merge pull request #7747 from SamHPurp/ouch-hot-hot-hot
...
Halts another macro suicide method
2017-09-24 18:48:52 -07:00
Xsingular
88c6cb23ff
Fixed efficiency math in Turbine.dm
...
Fixed the RPM equation in the Compressor part of Turbine.
2017-09-24 01:55:29 +02:00
Sam
18dd833e62
Update lighting.dm
2017-08-17 07:13:40 +01:00
Fox-McCloud
9d14e6c9da
Merge remote-tracking branch 'upstream/master' into lungsss
...
# Conflicts:
# code/modules/mob/living/carbon/alien/humanoid/life.dm
# code/modules/mob/living/carbon/human/life.dm
# code/modules/mob/living/carbon/human/species/station.dm
# code/modules/surgery/surgery.dm
2017-08-05 19:03:52 -04:00
Fox-McCloud
c3ed8de770
faster
2017-08-04 17:15:47 -04:00
Fox-McCloud
2f87d0f55a
Reduces Tesla Cost
2017-08-03 19:37:10 -04:00
Fox-McCloud
6bd0d17527
performance
2017-07-31 14:01:15 -04:00
Fox-McCloud
027e7619f5
Removes All Comments about auto-correction and Finddeclaration.exe
2017-07-22 02:54:45 -04:00
Fox-McCloud
77375fc1c4
Breathing is Now Handled on Lungs
2017-07-19 03:28:21 -04:00
Crazylemon64
8993e05a0b
Fixes easy cable laying
2017-07-16 16:44:46 -07:00
Sam
a0f361efa5
feelin hot hot hot
2017-07-10 02:32:00 +01:00
Sam
7c7c8c70cb
Merge remote-tracking branch 'refs/remotes/origin/master' into Intent-defines
2017-06-10 10:16:33 +01:00
Sam
7cf499dcc1
Adds movement intents
2017-06-10 10:12:14 +01:00
Sam
4d57fff5c9
Updates Intents
2017-06-10 09:43:36 +01:00
HeadyBucket
e7c5f8bf0c
Fix infinite glass exploit
...
Fixes an exploit where glass can be infinitely made. simples.
Also changed a list var and deleted two just because it stuck out for me.
2017-06-06 23:12:50 +01:00
tigercat2000
633c972f46
RnD autolathe removal + tech level overhaul
2017-06-01 11:34:29 -07:00
Sam
2d13e2f7bf
Converts /modules/ to using WEIGHT_CLASS_x
2017-05-28 01:25:09 +01:00
Fox-McCloud
31c9519f3e
More GC Define Transitions
2017-05-13 04:24:05 -04:00
Crazylemon64
1840074921
Refactors "organs" to be "bodyparts" to end confusion once and for all
2017-04-29 23:23:09 -07:00
Crazy Lemon
327f89c890
Merge pull request #6950 from Fox-McCloud/tesla-tweaks
...
Tesla Update
2017-04-21 09:52:23 -07:00
Markolie
d9653c79f5
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into findnreplace
...
# Conflicts:
# code/game/machinery/recharger.dm
# code/game/objects/items/devices/autopsy.dm
# code/game/objects/items/devices/modkit.dm
# code/game/objects/structures/lattice.dm
2017-04-14 18:15:12 +02:00
Crazy Lemon
ff271f7b29
Merge pull request #7061 from Fox-McCloud/damn-cells
...
Damn cells
2017-04-09 13:55:30 -07:00
Fox-McCloud
5631d36ff8
Converts Most Destroys to use QDEL_NULL
2017-04-04 23:08:41 -04:00
Fox-McCloud
35ab7ada94
Refactors Cell Energy Values
2017-04-01 20:14:29 -04:00
Mark van Alphen
2d1c04c112
Merge branch 'master' into findnreplace
2017-04-01 23:51:58 +02:00
Fox-McCloud
5037ebde3d
tg object system
2017-03-30 17:40:46 -04:00
Fox-McCloud
c08c13689c
Merge remote-tracking branch 'upstream/master' into tesla-tweaks
2017-03-30 17:38:04 -04:00
Fox McCloud
af68615415
Merge pull request #6956 from Crazylemon64/wire_mapload_fix
...
Away missions load cables and maploader landmarks smoothly now
2017-03-27 03:54:00 -04:00
Crazylemon64
babe5eb074
Away missions load cables, pipes, and templates OK now
2017-03-27 00:37:24 -07:00
Crazy Lemon
09f7b52f3b
Merge pull request #6906 from Fox-McCloud/merge-oddities
...
Fixes Stack Merge Oddities
2017-03-26 23:27:58 -07:00
Fox-McCloud
ee44034138
Tesla Update
2017-03-26 17:53:55 -04:00
Mark van Alphen
cd78336ab8
Merge branch 'master' into findnreplace
2017-03-25 00:11:39 +01:00
Sam
1bc17e5b23
Quality of life change + grammar fixes
2017-03-24 21:09:11 +00:00
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
KasparoVy
86ddfcb5e9
Fixes Bug with PA Computer Icon
...
Won't render as fully constructed at the start of a round anymore. Now
shoes as an empty frame, as intended.
2017-03-21 15:42:24 -04:00
Mark van Alphen
06b3460d6e
Merge branch 'master' into findnreplace
2017-03-15 16:02:14 +01:00
Mark van Alphen
cef5626f85
Merge branch 'master' into findnreplace
2017-03-09 17:32:42 +01:00
davipatury
2a9bcde361
Fix conflicts.
2017-03-09 12:01:50 -03: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
