cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 12:43:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,877 Commits 8 Branches 0 Tags
c2058864f0effce2de185cf7d8c7ec5bfe923b7c
Commit Graph

13268 Commits

Author SHA1 Message Date
Chinsky
78142a7cc2 Merge pull request #5276 from caelaislinn/xenoarchaeology 
Xenoarchaeology
 2014-06-20 14:41:25 +04:00
Cael Aislinn
22cc2558ff switched autocloner and replicator artifacts over to a timer system, made replicator use materials to create items (materials can be anything) 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2014-06-20 18:42:38 +10:00
Cael Aislinn
f02e6fdd45 rework talking items and re-enable them, made xenoarch boxes have a variable internal size, added three new eldritch xenoarch finds (poltergeist mask, vampiric statuette, endless replenishing container) 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2014-06-20 18:42:25 +10:00
Chinsky
6f6cf57a93 Merge pull request #5277 from Jarcolr/dev 
Adds paths for therapy dolls from #2731
 2014-06-20 09:02:03 +04:00
Hubblenaut
8a4739197e Merge branch 'backup' into medical 2014-06-19 15:36:28 +02:00
Mloc
a00128c0ad Merge pull request #5280 from comma/virus-racism 
Diskette size change
 2014-06-19 14:21:19 +01:00
Zuhayr
39acf41328 Merge pull request #5293 from mwerezak/armour 
Allows armour to turn sharp attacks into blunt attacks with some probability
 2014-06-19 21:08:39 +09:30
Zuhayr
69d25ea048 Merge pull request #5301 from mwerezak/cargo-shuttle2 
Docking Controllers Stage 3: Cargo Shuttle
 2014-06-19 21:08:29 +09:30
Zuhayr
2a804244e3 Merge pull request #5279 from comma/guestid 
Guest passes
 2014-06-19 18:06:47 +09:30
Cael Aislinn
ad35bf3262 harvester can now harvest artifact's secondary effect, which effect it chooses is determined by which are active (if both are active it can harvest neither) 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2014-06-19 15:41:35 +10:00
Cael Aislinn
fc99c5b65f miscellaneous fixes to various anomaly utiliser effects involving location/holder issues, fixed anomaly harvester runtime, reworks anomaly utiliser to be a lot easier/nicer to use, balance tweaks: 
- caps stun effect values for pulsing
- sets max utiliser battery charge to 300 (30 sec)
- changes energy consumption for utiliser pulse effects to "effect max charge level" * "effect range" ^ 2
- changes energy consumption for utiliser touch effects to 100 (10 sec worth of consumption)

Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2014-06-19 13:52:21 +10:00
mwerezak
c28fd0ecb5 Adds supply shuttle docking controllers 2014-06-18 21:25:17 -04:00
mwerezak
5006ebde14 Makes the supply shuttle process in a tighter loop 2014-06-18 21:24:57 -04:00
Cael Aislinn
f3ab8b0748 moved xenoarchaeology master controller code into a separate file 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2014-06-19 11:07:12 +10:00
Cael Aislinn
0e1c367012 reconstitutor has a chance to extract multiple genomes per fossil (50% for two genomes, 37.5% chance for three genomes), moved xenoarchaeology initialisation code into the master controller, added upper and lower spawn vals for digsite turf number and artifact machine number, added circuitboards for the reconstitutors, fixes missing clonepod for flora reconstitutors 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2014-06-19 11:06:20 +10:00
Cael Aislinn
6c46ceaf6d Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenoarchaeology 
Conflicts:
	icons/obj/hydroponics.dmi

manual merge of conflicted icon file

Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2014-06-19 10:05:27 +10:00
mwerezak
e46c3c8834 Renames supply controller global var 
Renamed from 'supply_shuttle' to 'supply_controller'
 2014-06-18 19:37:46 -04:00
mwerezak
462593f0b5 Adds supply shuttle datum 2014-06-18 19:37:30 -04:00
Hubblenaut
5e8a82bb0a Fixes text color in advanced trauma kit surgery step 2014-06-18 23:11:01 +02:00
Hubblenaut
909c2d44a9 Removes medical belts from lockers 2014-06-18 22:35:56 +02:00
mwerezak
37b71c81fb Armour can turn sharp attacks into blunt ones 
Kind of messy, but I couldn't find another way to do it without
reworking a lot of the mob defence procs.
 2014-06-18 10:28:23 -04:00
mwerezak
5a3c7dc432 Fixes human/checkarmor getting the armour... 
...value for the wrong body part.

Whoever put ran_zone() in there wasn't thinking straight, as it's not
going to affect the part that actually gets damaged.
 2014-06-18 10:05:04 -04:00
mwerezak
2daab86c89 Fixes special shuttle consoles being... 
...deconstructible
 2014-06-18 09:37:30 -04:00
Chinsky
9e8b124037 ixes #5075 
Mech fabricator redefined check access for no reason, let base proc handle it.
Adds span classes for messages guestpass console gives.
 2014-06-17 18:25:39 +04:00
Chinsky
be95e54e43 Merge branch 'master' into dev 
Conflicts:
	code/defines/obj/weapon.dm
	code/modules/mob/living/carbon/species.dm
	code/modules/mob/living/silicon/say.dm
	icons/mob/uniform.dmi
	maps/tgstation2.dmm
 2014-06-17 16:16:44 +04:00
Jarcolr
5d2bba3434 Adds paths for therapy dolls 
http://puu.sh/9xlQu/53016923a6.dmi for the dolls that are already in the
code but unused.
 2014-06-17 14:53:18 +03:00
Chinsky
08dd01801e Merge pull request #5266 from mwerezak/firelock-fix 
Proposes a fix for #5224
 2014-06-17 14:58:33 +04:00
Chinsky
e304d0010d Merge pull request #5273 from boopcat/happydrones 
fixes!
 2014-06-17 14:43:55 +04:00
Chinsky
dd4a937ca9 Merge pull request #5275 from GinjaNinja32/lighters 
Fixes cheap lighters burning body parts other than the hands they're being held in
 2014-06-17 14:43:24 +04:00
Chinsky
1ca6a54d3a Merge pull request #5265 from mwerezak/wound-fixes 
Fixes the wounding system
 2014-06-17 14:41:22 +04:00
mwerezak
944394a042 Fixes armour being applied to projectiles twice 2014-06-17 01:20:49 -04:00
mwerezak
72377d160f Fixes apply_damage ignoring species mods 
Also adds some adjust*Loss type procs for adjusting the damage on
specific body parts. apply_damage() should be the standard way to deal
damage to a mob, though.
 2014-06-17 00:54:20 -04:00
GinjaNinja32
fcdd0198c0 Fix lighter burning random body parts 2014-06-17 04:50:14 +01:00
mwerezak
274b03b083 Adds thrown object sharp and edge flags 2014-06-16 23:21:01 -04:00
unknown
e16658c37f Adds diona unarmed attack type 2014-06-16 19:23:20 -04:00
unknown
95e05a894b Fixes projectile sharp and edge flags being ignored 2014-06-16 19:17:20 -04:00
unknown
c5e09980b9 Fixes bleeding checks not respecting merged wounds 2014-06-16 18:49:20 -04:00
unknown
7b59cbec5c Fixes large amounts of damage being carried by minor wound types 2014-06-16 18:42:17 -04:00
Boop
07a6ad4897 Fixes #5270 
Changes simple_animal/Die() to use death from mob/living instead.
 2014-06-16 23:30:37 +01:00
mwerezak
9f7e7004a3 Breach detection update 
Now only triggers for abnormally low pressures.

Allows breach detection to trigger if an alarm was already raised in an
area for a different reason.
 2014-06-16 13:47:04 -04:00
mwerezak
6dee9cf65d 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.
 2014-06-16 13:26:44 -04:00
mwerezak
45c2274b0a Species claws are now sharp 2014-06-16 12:54:09 -04:00
mwerezak
8461e5b01f Fixes bruises not having the right damage_type set 2014-06-16 12:15:31 -04:00
mwerezak
e829f8a633 Fixes wound merging 
Fixes wound merging completely ignoring things like bleed_timers,
bandaged and salved states, etc.
 2014-06-16 12:15:11 -04:00
Loganbacca
32af387a25 Cargo train tweaks 
- Reduce speed to slightly slower than running
- Only knock people over if emagged, otherwise just bump them back
- Temporarily disable latching trailers inline because no directional sprites (may or may not introduce bugs)
 2014-06-16 20:54:18 +12:00
mwerezak
17aca7e84d Fixes #5224 2014-06-16 01:43:56 -04:00
mwerezak
832fb31941 Fixes many small wounds protecting against... 
...internal damage.

Also removed started_healing() proc because it doesn't actually report
whether the wound is healing and isn't really used for anything.
 2014-06-16 01:04:30 -04:00
mwerezak
9f594e4755 Bullets are now properly sharp 2014-06-15 20:28:34 -04:00
mwerezak
1b33ca943d Separates the sharp flag into edge and sharp 
Now weapons can properly cause cuts without necessarily having a greater
chance to remove limbs.

Also separates is_sharp, has_edge, and can_puncture.
 2014-06-15 20:25:39 -04:00
mwerezak
cbec032ae3 Fixes wrong wound types being used 
This fixes the autoheal bug, which was being caused by wound types such
as tiny bruises from being used even for large amounts of damage.

I imagine that relying on the order of the list returned by typesof() is
always a bad idea.
 2014-06-15 19:08:29 -04:00