Commit Graph

7994 Commits

Author SHA1 Message Date
ZomgPonies
415013ef22 Merge pull request #357 from VampyrBytes/master
fix for #248
2014-08-06 01:34:20 -04:00
ZomgPonies
d388e0b069 Merge pull request #356 from Regory/scoreboard-mining
Scoreboard mining
2014-08-06 01:33:46 -04:00
ZomgPonies
5b04ef3385 Merge pull request #355 from Bone-White/master
Pipe wall drilling fix
2014-08-05 20:34:01 -04:00
Bone White
3c4db5076a Better adminlogs for virus mutations in mobs 2014-08-05 22:46:38 +01:00
Bone White
dc2bf43c11 Added adminlog to virus mutations in mobs 2014-08-05 22:39:15 +01:00
Bone White
26acad361e Added Admin PM by Key verb 2014-08-05 16:38:37 +01:00
ZomgPonies
db4a165244 Turned heavy laser into a kind of laser minigun. Still more bang for your buck than a regular laser 2014-08-05 00:11:57 -04:00
Rob Nelson
3a3e8ac7be Fix grey eyes, add bitching when hairstyles are invalid.
Conflicts:
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/species.dm
	code/modules/mob/new_player/sprite_accessories.dm
2014-08-04 22:29:38 -04:00
Rob Nelson
a78316732f Fix compile. 2014-08-04 22:23:26 -04:00
Rob Nelson
7e8c1cf7fe Plasmamen ignite when not wearing their suit.
Conflicts:
	code/modules/mob/living/carbon/human/human_defines.dm
2014-08-04 22:23:11 -04:00
Regory
ce7d05ccf3 Fix errors from ticker initializing after map ore
Ores only count towards the station's score if it spawns on Z=5 (Mining
Asteroid Level).  The old method caused errors in the server log because
gameticker/ticker initialized after the map ore spawns.

This also means that ore mined on the Clown Planet don't count.
2014-08-04 16:24:00 -04:00
Regory
109754ac2b Track Ore Mined for Scoreboard
Increments the score for ore mined each time ore is mined (i.e.:
spawned) after the game starts.
2014-08-04 12:00:44 -04:00
VampyrBytes
bb2c311b28 fix for #248
Don't close #248 yet though, need to test this one on the main server -
kinda tricky to perform surgery on yourself ;)
2014-08-04 08:20:47 +01:00
ZomgPonies
509af0b236 Stun revolver rebalance. 25% more powerful than regular taser. Lost it's insta-stun 2014-08-04 01:54:27 -04:00
ZomgPonies
a3fdd71012 Forgot an event verb for seniormins 2014-08-03 22:08:41 -04:00
mwerezak
c22ea7a5c0 Fixes some handcuff oversights
You now don't need to be grabbing to put handcuffs on yourself, and you
can now put hancuffs on if your grab state is higher than aggressive.
2014-08-03 16:15:47 -04:00
mwerezak
90e0da92cc Removes duplicate code from human/bullet_act
Also moves stun projectile handling up to living/bullet_act, as all the
human specific code has been moved to other procs

Conflicts:
	code/modules/mob/living/carbon/human/human_defense.dm
	code/modules/mob/living/living_defense.dm
2014-08-03 16:15:10 -04:00
mwerezak
8829bca02b Cleans up weapon embedding code
Removed weapon embedding from human/apply_damage(), as it didn't really
belong there. As well, used_weapon is intended mainly for autopsy info,
so it didn't seem appropriate to use it to embed things.

Conflicts:
	code/modules/mob/living/carbon/human/human_damage.dm
2014-08-03 16:11:04 -04:00
mwerezak
2c7926eff8 Stunbaton fixes and cleanup
Apparently harm intent is "hurt", not "harm"

Conflicts:
	code/game/objects/items/weapons/stunbaton.dm
2014-08-03 16:09:38 -04:00
mwerezak
3eae360963 Handcuffs now require an aggressive grab
Conflicts:
	code/game/objects/items/weapons/handcuffs.dm
2014-08-03 16:07:35 -04:00
mwerezak
ee9fe24083 Fixes siemens coefficient not blocking stun disarm
Conflicts:
	code/modules/mob/living/carbon/human/human_defense.dm
2014-08-03 16:02:47 -04:00
mwerezak
321598a8a1 Makes humans scream if taking enough halloss 2014-08-03 16:01:04 -04:00
mwerezak
279718728f Allows the use of stun weapons to show up in autopsies
Conflicts:
	code/game/objects/items/weapons/stunbaton.dm
	code/modules/mob/living/carbon/human/human_defense.dm
2014-08-03 16:00:48 -04:00
mwerezak
bbdd4641d0 Adds disarm effect for stun weapons and hands 2014-08-03 15:59:39 -04:00
mwerezak
f43a3ead70 Merges taser and stun baton effects
Makes the code for handling stun weapon effects much cleaner.
Moves electrocute_act and emp_act from living.dm into living_defense.dm

Conflicts:
	code/game/objects/items/weapons/stunbaton.dm
	code/modules/mob/living/carbon/human/human_defense.dm
	code/modules/mob/living/living.dm
2014-08-03 15:59:21 -04:00
mwerezak
64638987dc Adds siemens_coefficient handling to stun batons
Conflicts:
	code/game/objects/items/weapons/stunbaton.dm
2014-08-03 15:54:34 -04:00
mwerezak
ac0e3966d6 Taser cleanup and fixes
Fixes cloaking devices and deadman switches being included in taser code
somehow.

Conflicts:
	code/modules/mob/living/carbon/human/human_defense.dm
2014-08-03 15:47:21 -04:00
mwerezak
0dc07bafa1 Stun baton nerf
Adds agonyforce var to stun batons, which causes halloss and eye blur.

Also did some clean up of stun batons, and fixed the stun baton's bcell
var being of type weapon/cell/high instead of weapon/cell.

Conflicts:
	code/_onclick/item_attack.dm
	code/game/objects/items/weapons/stunbaton.dm
2014-08-03 15:40:19 -04:00
ZomgPonies
8807058f9b Something I didnt add yet 2014-08-03 15:28:57 -04:00
Whitellama
8c27a4e092 Wet rag no longer makes noise or hits when wiping down windows (nor does anything with the NOBLUDGEON flag) 2014-08-03 15:28:36 -04:00
Whitellama
6b1ba1b6a3 Fixed #5870: Glasses being labeled both 'glass' and 'Drinking glass' inconsistently
Conflicts:
	code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm
2014-08-03 15:28:20 -04:00
Walter0o
23bc5b822c fixes runtime with calling PP on dna-less mobs
Conflicts:
	code/modules/admin/admin.dm
2014-08-03 15:26:36 -04:00
mwerezak
e76cc064df Fixes siemens_coefficent not affecting shock damage
Also cleans up electrocute_act()

Conflicts:
	code/game/gamemodes/events/ninja_equipment.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/carbon/human/human.dm
2014-08-03 15:24:53 -04:00
ZomgPonies
ea1f8307d0 Removed some unused vars 2014-08-03 15:14:38 -04:00
Loganbacca
5faef31f60 Train fixes and balancing
- Slows trains to 90% of running speed
- Changes train impact damage to only take into account speed, not train length (otherwise you could insta kill people with a long enough train)
- Fixes a bug with towed cars ghosting through closed airlocks
- Stuns mobs who fall off a train that has blown up
- Fixes mobs standing/lying on vehicles
- Fixes exploding trains not decoupling correctly

Conflicts:
	code/modules/mob/mob.dm
	code/modules/vehicles/cargo_train.dm
	code/modules/vehicles/train.dm
2014-08-03 15:13:52 -04:00
Loganbacca
aeeafcfdb1 Reversing fix
- Allows cargo tugs to reverse their direction if they are not towing anything
2014-08-03 15:08:22 -04:00
Loganbacca
4d2d8cb655 Verb fix
- Handles verb changes in the turn_off() and turn_on() procs
2014-08-03 15:08:11 -04:00
Walter0o
0ac078ad46 derping derps
thanks to @mwerezak
2014-08-03 15:07:07 -04:00
ZomgPonies
ebca6c5e61 Derpyderp 2014-08-03 15:06:47 -04:00
ZomgPonies
3facb45fa2 Derp 2014-08-03 15:05:22 -04:00
Walter0o
2a0a7db434 cyborg topic exploit fixes
all kinds of fun here
Conflicts:
	code/modules/mob/living/silicon/robot/robot.dm
2014-08-03 15:04:48 -04:00
Walter0o
6935180aee filing cabinet exploit fix
hooray for teleporting atoms to you via magic office furniture
2014-08-03 15:01:10 -04:00
Walter0o
d92d7fb30a refining the clipboard topic checks 2014-08-03 14:59:53 -04:00
Walter0o
d9884f054d paper exploit fixes
i think my favourite part of this was
```var/obj/item/i = usr.get_active_hand()
if( ...  && usr.get_active_hand() != i))```
2014-08-03 14:59:38 -04:00
Walter0o
fb7d02ee1f folder exploit fixes
Conflicts:
	code/modules/paperwork/folders.dm
2014-08-03 14:58:04 -04:00
Walter0o
3cc234cb03 clipboard exploit fixes 2014-08-03 14:57:13 -04:00
Zuhayr
a8ae953579 Fixes #5630
Conflicts:
	code/modules/mob/living/silicon/robot/robot_modules.dm
2014-08-03 14:54:45 -04:00
Zuhayr
20e6a01bb8 Fixes #5737 2014-08-03 14:53:45 -04:00
VampyrBytes
b8bb0d1347 Machine people fixes
Disables overheating as most players reporting it makes machine people
unplayable

Fixes machine people's immunity to clone damage

Ensures machine people fall apart and consiousness transferred to
posibrain properly

Prevents robotic chest and groin being seperated which was leading to an
unrepairable body
2014-08-02 11:39:01 +01:00
Zuhayr
ceb7cb9419 Reapplying some fixes that I think DM may have saved over, whoops. 2014-08-02 22:34:17 -04:00