cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 12:37:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
17,073 Commits 13 Branches 2 Tags
ea26d37fdecc793727fe5355a56a1ccd5cf21b8d
Commit Graph
17073 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
ZomgPonies ea26d37fde Quick fix for PM colors 2014-06-19 19:21:15 -04:00
ZomgPonies a8b755da1a Version 1 of the ahelp overhaul 2014-06-19 19:18:50 -04:00
ZomgPonies 3f0f5b0327 Fun removal commitee was unanimous 2014-06-19 17:51:51 -04:00
ZomgPonies 1bf4d485a4 Derp 2014-06-19 16:53:15 -04:00
ZomgPonies 9700a8e54b Fart sound. 2014-06-19 16:37:59 -04:00
ZomgPonies ae618ec644 Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-06-19 15:25:38 -04:00
ZomgPonies 8b77070cbe Added new minerals and sprites to mining 2014-06-19 15:24:03 -04:00
Necaladun bef546bb7b 3rd times the charm - trinary 
Changed to :5 because :t was conflicting with something to do with
radio?
 2014-06-20 04:15:15 +09:30
ZomgPonies a4c71029f0 Cargo shuttle fix 2014-06-19 14:36:56 -04:00
ESwordTheCatandZomgPonies d17486b635 Revert it to this. 2014-06-19 10:34:26 -04:00
ESwordTheCatandZomgPonies d81d1736fc Remove spawn. 2014-06-19 10:34:14 -04:00
ESwordTheCatandZomgPonies bb54ac1ac4 Fix artifact spreading and large scanner. Remove extra list used the master_controller var again. 
Conflicts:
	code/modules/mining/mine_turfs.dm
	code/modules/research/xenoarchaeology/misc.dm
	code/modules/research/xenoarchaeology/tools/tools_anoscanner.dm
 2014-06-19 10:33:50 -04:00
JarcolrandZomgPonies 4f20de625c Fixes #5255 and walking over edges 
Before walking over an asteroid edge would have put the mob under the
sprite, as if the mob crawled under it.
 2014-06-19 10:14:35 -04:00
mwerezakandZomgPonies 428bf6d350 Adds supply shuttle docking controllers 
Conflicts:
	maps/tgstation2.dmm
 2014-06-19 10:13:48 -04:00
mwerezakandZomgPonies 175c48240d Makes the supply shuttle process in a tighter loop 
Conflicts:
	code/game/supplyshuttle.dm
 2014-06-19 09:54:45 -04:00
mwerezakandZomgPonies 723979115c Renames supply controller global var 
Renamed from 'supply_shuttle' to 'supply_controller'

Conflicts:
	code/controllers/verbs.dm
	code/game/gamemodes/gameticker.dm
	code/game/supplyshuttle.dm
 2014-06-19 09:52:35 -04:00
mwerezakandZomgPonies bc2fa7940a Adds supply shuttle datum 2014-06-19 09:40:28 -04:00
mwerezakandZomgPonies 6b692feff0 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-19 09:40:04 -04:00
mwerezakandZomgPonies 6e7139087e 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-19 09:39:44 -04:00
ZomgPonies 2bb790f381 Sec overhaul someone forgot to re-add Brigston flag 2014-06-19 09:39:15 -04:00
ZomgPonies 39fe61f492 Added rolled down jumpsuit sprites for vox 2014-06-19 00:05:58 -04:00
ZomgPonies aff366922e Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-06-18 23:52:23 -04:00
ZomgPonies 1fd830ca2c More mineral sprites. 2014-06-18 23:52:02 -04:00
ZomgPonies 5cd6acc420 Merge pull request #263 from Bone-White/master 
Stasis Bag lock added
 2014-06-18 22:43:13 -04:00
mwerezakandZomgPonies b7c3e13901 Fixes special shuttle consoles being... 
...deconstructible
 2014-06-18 22:18:08 -04:00
mwerezakandZomgPonies a06850450a Fixes tails not rendering on the player preview 2014-06-18 22:17:29 -04:00
mwerezakandZomgPonies 264595d178 Fixes tails not rendering in record photos 2014-06-18 22:17:05 -04:00
BoopandZomgPonies f4cf6b3a0d Fix latex gloves box not having the right sprite 2014-06-18 22:15:34 -04:00
BoopandZomgPonies 93d7f057e0 Fix runtime with brains and throwmode 
Conflicts:
	code/modules/mob/living/carbon/carbon.dm
 2014-06-18 22:14:44 -04:00
Bone White 38655f81da Stasis Bag lock added 
Can be locked/unlocked by medical access.  Unlocked by default when
closed.
 2014-06-18 16:20:31 +01:00
ZomgPonies 6e183d53ef Minor map fix 2014-06-18 08:35:37 -04:00
ZomgPonies f29faf57c0 Fixing Regens' fuckups 2014-06-18 08:33:06 -04:00
ZomgPonies 63cfbd6667 Revert "Removed inaprovaline fixing Internal bleeding" 
This reverts commit 82ef708223.
 2014-06-18 08:26:17 -04:00
ZomgPonies 93dc02a702 Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-06-18 08:22:49 -04:00
BoopandZomgPonies 3ab1011a85 Fixes #5291 and another wound runtime 2014-06-18 08:22:33 -04:00
Necaladun 187f56d996 Kidan language fix 
Kidan language to :4 instead of :l to avoid radio chat
 2014-06-18 21:50:07 +09:30
ZomgPonies fbcd03f740 Merge pull request #262 from Regen1/Alien-nightvision 
Gave nightvision to Aliens and Shadow people
 2014-06-18 08:07:32 -04:00
Regen 7de8683435 Gave nightvision to Aliens and Shadow people 2014-06-18 14:01:55 +02:00
ZomgPonies 37e975fcc8 Merge pull request #261 from Bone-White/master 
Pickpocket Gloves fix
 2014-06-18 06:34:37 -04:00
Bone White 89b8a002bf Pickpocket Gloves fix 
They can now take/place ids without notifying, and ids enter the
pickpocket's hand instead of dropping to the floor or not working.
 2014-06-18 11:04:33 +01:00
ZomgPonies 384992c9fc Merge pull request #252 from Regen1/Combat-borgs 
Combat borgs + various tweaks
 2014-06-18 06:01:46 -04:00
Necaladun 4340ba620d Fixing a derp 
trinary should be t
 2014-06-18 18:43:01 +09:30
Necaladun 2cbbdcf7fd Fixing a wall 2014-06-18 18:42:26 +09:30
ZomgPonies 4fb9cf4aa9 Final shuttle controller for ERT/DS shuttle. 2014-06-18 01:12:28 -04:00
JarcolrandZomgPonies 2ae3dd0746 Adds paths for therapy dolls 
http://puu.sh/9xlQu/53016923a6.dmi for the dolls that are already in the
code but unused.

Conflicts:
	code/game/objects/items/toys.dm
 2014-06-18 00:08:33 -04:00
ChinskyandZomgPonies 5113c03c76 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-18 00:01:00 -04:00
Necaladun 7fec1c561c MP Language 
Trinary for MP
 2014-06-18 12:18:36 +09:30
Necaladun 6c850d406c Disability deactivation messages 
4 pony <3 neca
 2014-06-18 12:16:09 +09:30
ZomgPonies 8057001497 Merge pull request #258 from Bone-White/master 
Shock Glove fix, surgery table construction.
 2014-06-17 22:45:32 -04:00
alex-gh 1d78c35dca Merge pull request #260 from alex-gh/blob_reagents_rebalance 
Blob reagents rebalance.
 2014-06-18 02:30:12 +02:00