cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-06 07:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
20,606 Commits 26 Branches 2 Tags
7c739e474599ccddee25212399556c9a7eb9a7cc
Commit Graph

34 Commits

Author SHA1 Message Date
ZomgPonies
8a575700b9 Finally got colored blood working properly 2015-03-03 13:45:46 -05:00
Markolie
672305e034 Adds a "params" parameter to attackby(), so it keeps track of pixel_x and pixel_y among other things 2015-02-22 22:12:11 +01:00
DZD
4bcdb94a99 Merge with upstream/master 
Fixes conflicts
 2015-02-18 13:41:32 -05:00
DZD
fbd9c367c0 NODROP flag addition & handling 
- Purges canremove
- Implements functionality for NODROP flag, replaces canremove
- Refactors mob inventory unequipping.
 2015-02-18 13:22:41 -05:00
Markolie
0b937d5ace Emag refactor 2015-02-13 16:59:20 +01:00
Markolie
7285f39fc1 Defib update, cell path update 2015-02-09 16:12:01 +01:00
Artorp
528aabbc7b Fixed spare key in Paramedic 
The spare key in Paramedic can now be used on the ambulance.
 2015-01-29 09:28:37 +01:00
Markolie
7359061678 Bug fixes 2014-12-10 04:47:24 +01:00
mwerezak
af0ab6fc5c Fixes runtime in train/explode() 2014-08-16 21:10:23 -04:00
mwerezak
183c25167c Fixes #5915 
Also allows checking remaining engine charge by examining, and removes
the verb.

Conflicts:
	code/modules/vehicles/cargo_train.dm
 2014-08-16 21:08:25 -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
Loganbacca
0affd2b7c8 More train fixes 
- No passing plastic flaps
- Only human based mobs can board trains
- Adjacent checks for exiting vehicles
- Cleaned up as many direct loc moves as possible
- Places removed cells in the removers hand
 2014-07-28 13:34:50 -04:00
Loganbacca
5f758e2f4f Cargo train fixes 
- Adds overlay for cargo tug sprite
- Fixes failure feedback when successfully loading items on the train
- Stopped unnecessary loading failure feedback (like loading floors on trains, which will always fail)
- Stopped "hit" message when relabeling with the hand labeler

Conflicts:
	icons/obj/vehicles.dmi
 2014-07-26 11:23:12 -04:00
ZomgPonies
c0c3262d9b Compile fix 2014-07-24 19:10:36 -04:00
Loganbacca
936ad57e83 Cargo train fixes 
- Visual tweak for mobs on trolleys
- Fixed a teleportation bug when boarding trains from other trains
- Fixed a runtime involving on_click code
 2014-07-24 18:44:12 -04:00
Loganbacca
0e9e9fe596 Cargo train update 
- Adds sprites (thanks to Bishop)
- Adds order-able train cargo crates

Conflicts:
	code/datums/supplypacks.dm
	code/modules/vehicles/cargo_train.dm
	icons/obj/vehicles.dmi
 2014-07-24 18:43:13 -04:00
ZomgPonies
c1bbd0d51f Moar work on janicart overhaul 2014-07-13 15:52:59 -04:00
ZomgPonies
2ba308bdb0 Start work in janicart replacement train 2014-07-13 15:52:50 -04:00
Hubblenaut
6c0122e7d6 Fixes in wheelchair and different handling of movement 
Conflicts:
	code/game/objects/structures/stool_bed_chair_nest/bed.dm
	code/modules/mob/mob.dm
 2014-07-13 06:52:38 -04:00
ZomgPonies
592fe0a696 New ambulance sprite 2014-06-25 17:54:34 -04:00
ZomgPonies
a4f2b0af97 Fixed ambulance, added to map 2014-06-23 15:11:33 -04:00
ZomgPonies
7da1b056cf Waaaambulance 2014-06-23 14:23:59 -04:00
ZomgPonies
3493fc0961 Forgot this 2014-06-23 04:48:34 -04:00
Loganbacca
6f75a88d16 Cargo train update 
- Cleans up some old code
- Fixes some bugs
- Adds keys to start the engine

Conflicts:
	code/modules/vehicles/cargo_train.dm
	code/modules/vehicles/train.dm
	code/modules/vehicles/vehicle.dm
	icons/obj/vehicles.dmi
 2014-06-23 04:47:57 -04:00
mwerezak
7f425ecf9b Cleans up train latching/unlatching 
Also adds a verb for turning off train engines.

Conflicts:
	code/modules/vehicles/cargo_train.dm
	code/modules/vehicles/train.dm
 2014-06-21 13:09:50 -04:00
mwerezak
6d44eea078 Updates l_move_time to use world.time 2014-06-20 12:12:31 -04:00
Loganbacca
a72d2824dc New vehicle loading code 
Conflicts:
	code/modules/mob/mob.dm
	code/modules/mob/mob_movement.dm
 2014-06-20 09:01:00 -04:00
Loganbacca
4924324dbf Potential new sprite 2014-06-20 08:51:49 -04:00
ZomgPonies
bd75c061f0 Cargo train fixes 2014-06-16 05:14:30 -04:00
Loganbacca
80d616e624 Cargo train bugfixes 
Also adds admin messaging when someone gets run over.
 2014-06-14 22:15:31 -04:00
Loganbacca
083cd19c6a New vehicle framework 
- Implements a new vehicle framework
- Adds cargo trains

Conflicts:
	code/modules/mob/living/carbon/human/human.dm
 2014-06-14 22:14:53 -04:00