cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-25 17:02:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,671 Commits 29 Branches 2 Tags
d71e807fa4dae71c2f769226451c0cfebfdcae3e
Commit Graph

10798 Commits

Author SHA1 Message Date
Crazylemon64
d71e807fa4 Ghosts can now see the contents of smartfridges 2016-01-25 10:39:14 -08:00
TheDZD
388a265407 porta_turret fixes 
Fixes infinite loop caused by porta_turrets when trying to target something on the same tile as the turret.
Also fixes a miscellaneous runtime with the mecha wormhole projector.
 2016-01-24 17:13:47 -05:00
VampyrBytes
1517e716b1 Fixes #3354 and goes with damage suggestion in #3367 
If you try to stab someone in the eyes who doesn't have eyes they now
take 10-14 head damage
 2016-01-24 09:34:41 +00:00
VampyrBytes
d1cdbc3739 Revert "Fixes #3354" 
This reverts commit d24b2fc014.
 2016-01-24 09:28:50 +00:00
VampyrBytes
d24b2fc014 Fixes #3354 
If you stab someone who doesn't have eyes in the eyes it now damages
their head
 2016-01-24 08:37:10 +00:00
Fox-McCloud
0280b98cf6 "Fixes" Mecha Mining Scanner 2016-01-23 18:47:05 -05:00
Fox McCloud
92a27a141b Merge pull request #3349 from Tastyfish/airless-floor 
Fixed airless floor being plasteel airless floor
 2016-01-23 18:39:36 -05:00
TheDZD
9e166b029d Merge pull request #3335 from Fox-McCloud/knife-refactor-cargo-swat 
Assault Surplus Crate and Knife Refactor
 2016-01-23 18:20:54 -05:00
Fox McCloud
f7a114c5b2 Merge pull request #3350 from Tastyfish/fat-stacks-of-borg 
Fixed cyborgs recharging all stack types
 2016-01-23 18:14:50 -05:00
Fox-McCloud
fff0590492 Merge remote-tracking branch 'upstream/master' into knife-refactor-cargo-swat 2016-01-23 18:04:02 -05:00
TheDZD
eca90c1321 Merge pull request #3334 from Fox-McCloud/knight-armor 
Ports Knight Armor
 2016-01-23 17:51:51 -05:00
Tastyfish
f68121cafa Fixed cyborgs recharging all stack types 2016-01-23 09:32:21 -05:00
Tastyfish
ec2e80ea65 Fixed airless floor being plasteel airless floor 2016-01-23 08:43:03 -05:00
Fox-McCloud
7d30c5aa8f chaplain closet 2016-01-23 07:57:30 -05:00
Fox-McCloud
14a2022ef4 sword 2016-01-23 07:29:36 -05:00
Fox-McCloud
75e9466540 Fixes Hulk Not Properly Being Removed 2016-01-22 23:50:40 -05:00
Tastyfish
4c6a8b49e9 Fixed table placing messing up adjacent flipped tables 2016-01-22 12:01:03 -05:00
Fox-McCloud
f5220f7ce3 Assault Surplus Create and Knife Refactor 2016-01-22 10:04:24 -05:00
Fox-McCloud
a5622a230f Ports Knight Armor 2016-01-22 07:14:55 -05:00
Fox McCloud
e827aa1f11 Merge pull request #3332 from tigercat2000/fucking_commies 
Fixes #3323, sanitize your shit
 2016-01-22 01:16:11 -05:00
Tigercat2000
9926210354 Fixes #3323, sanitize your shit 2016-01-21 22:00:22 -08:00
Tigercat2000
be18f1a63a Fixes #3303, legit implants for adv_med 2016-01-21 21:42:09 -08:00
Fox McCloud
2c0a43a770 Merge pull request #3325 from tigercat2000/more_objective_fuckups 
Fix #3259 in an annoying way
 2016-01-21 23:39:54 -05:00
Tigercat2000
bfcc172edc Fix #3259 in an annoying way 2016-01-21 20:09:39 -08:00
Fox-McCloud
a5f316111d vampire tweaks 2016-01-21 18:58:09 -05:00
Fox-McCloud
c184985a3d Merge remote-tracking branch 'upstream/master' into ling-hud 2016-01-21 18:22:52 -05:00
Fox McCloud
ccf7297da8 Merge pull request #3297 from Tastyfish/stop-hotwiring-the-tesla-you-tossers 
Trained Poly on proper tesla engine use.
 2016-01-21 18:21:48 -05:00
TheDZD
3ab3227073 Merge pull request #3305 from Fox-McCloud/vamp-hud-removal 
Removes Vampire HUD
 2016-01-21 18:21:39 -05:00
Fox-McCloud
fb11acbf79 Implements Ling HUD 2016-01-20 22:38:26 -05:00
Fox McCloud
0c4b851da7 Merge pull request #3288 from FalseIncarnate/master 
Cigarette Pack Functionality
 2016-01-20 18:33:09 -05:00
TheDZD
c8c7382691 Merge pull request #3284 from Fox-McCloud/telecrystal-change 
Raw Telecrystal on Uplink Implants
 2016-01-20 18:24:53 -05:00
TheDZD
7387fe34f9 Merge pull request #3289 from Fox-McCloud/pai-cooldown 
pAI Cooldown Reduction
 2016-01-20 18:24:48 -05:00
Fox-McCloud
a644600ab8 Removes Vampire HUD 2016-01-20 17:45:43 -05:00
Tastyfish
2406f7f432 Fixes table flipping graphics 2016-01-20 03:41:09 -05:00
Tastyfish
d50c1ee3da Trained Poly on proper tesla engine use. Player simple mobs can now hear headsets as applicable. 2016-01-20 02:13:38 -05:00
TheDZD
c7b9c3dc6e Merge pull request #3273 from Fox-McCloud/implant-refactor-II 
Implant Refactor Part II
 2016-01-19 19:11:10 -05:00
Tastyfish
6c3f49652d Fixed ID computer access report 2016-01-19 16:25:11 -05:00
Fox-McCloud
2ee71405ee pAI Cooldown Reduction 2016-01-19 06:24:39 -05:00
FalseIncarnate
fca3996fcb Cigarette Pack Functionality 
Adds the ability to put cheap lighters and individual matches into
cigarette packs at the cost of cigarette slots.
- A cheap lighter takes up the space of 2 cigarettes
- Zippos won't fit, they are too boxy.
- A match takes up the space of 1 cigarette.

Increases the w_class of all lighters (cheap, zippo, and special zippos)
from 1 to 2
- Still fits in pockets, just can't shove as many into a box as they
take up more space

Adds the ability to light and put out matches on your shoes.
- Good for when you lose that matchbox (or shove matches into a cig
pack) and need a light.
- Works on all shoes, from the humble brown shoes to the devious
syndicate magboots, and even the clown shoes.

Based on the suggestion from:
http://nanotrasen.se/phpbb3/viewtopic.php?f=12&t=6880
 2016-01-19 02:49:00 -05:00
Fox-McCloud
dd587ab4c5 Raw Telecrystal on Uplink Implants 2016-01-19 00:23:56 -05:00
Fox-McCloud
3bae432c26 exploit fix 2016-01-18 23:56:17 -05:00
TheDZD
a89276a179 Merge pull request #3274 from Fox-McCloud/attack-fixes 
Fixes Some Items Attacks
 2016-01-18 19:58:15 -05:00
Fox-McCloud
f67959b571 cryo computer 2016-01-18 18:55:44 -05:00
Fox-McCloud
f512a00883 Fixes Swarmer Cryopod Eating 2016-01-18 18:17:59 -05:00
Fox McCloud
708d1eca39 Merge pull request #3269 from tigercat2000/back_to_the_beginning 
Gibber stuff (and fixing a compile warning *glares at Aurora*)
 2016-01-18 18:03:31 -05:00
Fox-McCloud
b4244b3921 Fixes Some Items Attacks 2016-01-18 01:25:10 -05:00
Fox McCloud
5a88ea74f0 Merge pull request #3262 from Tastyfish/wanted-photo 
Added printing crew photo from security records
 2016-01-17 21:04:29 -05:00
Fox-McCloud
4fe83049fd death alarm sanity 2016-01-17 20:40:12 -05:00
Fox-McCloud
1bd3da4521 Implant Refactor Part II 2016-01-17 20:03:41 -05:00
TheDZD
69f6c178aa Merge pull request #3251 from Fox-McCloud/implant-refactor 
TG Implant Refactor/Overhaul
 2016-01-17 18:37:50 -05:00