cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-04-29 11:31:31 +01:00
Code Issues Packages Projects Releases Wiki Activity
18,092 Commits 11 Branches 2 Tags
4b647c19057aec9a54b97a4e0b556eec9f0d5ba5
Commit Graph

8029 Commits

Author SHA1 Message Date
mwerezak
4b647c1905 Fixes xbow tension not being rest when fired 2014-08-16 20:58:58 -04:00
ZomgPonies
b06eb66ca4 Fix for bloody hands yanking shit 2014-08-16 20:58:37 -04:00
ZomgPonies
2cfe8a8765 Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-08-16 18:12:53 -04:00
ZomgPonies
bdb35c7b3a MySQL fixes 2014-08-16 18:12:44 -04:00
ZomgPonies
24b78b69be Use absolute paths next time 2014-08-16 18:11:49 -04:00
Bone White
aea80f8200 Altered disarm knockdown 
now only occurs with a 30% chance if you already have an aggressive grab
(or better) on the target.

No more disarm > stun baton.
 2014-08-16 06:21:31 +01:00
iamgoofball
4330a339cd beep book goonfabs 4 i fucking hate git etc etc. 2014-08-14 12:27:15 -07:00
ZomgPonies
9919eac70d Merge pull request #380 from Bone-White/master 
EVA slow alterations
 2014-08-13 00:15:15 -04:00
Bone White
baa349c407 slightly increased syndicate rigs slow 2014-08-13 01:27:13 +01:00
Bone White
7136864763 EVA slow alterations 
Far less punishing to "better" rig types e.g. CE, syndicate, ERT,
deathsquad, wizard
 2014-08-13 01:23:53 +01:00
ZomgPonies
2feedafaae Merge pull request #375 from VampyrBytes/master 
couple of fixes
 2014-08-11 20:38:11 -04:00
ZomgPonies
65af681dad Merge pull request #370 from Regory/tajaran-spawn-gloves 
Better Racial Item Spawns
 2014-08-11 20:37:02 -04:00
W3bster
b66e875830 Map changes. Compile fix. 
-Fixed the compile error.
-Magistrate's office, linked with IAA's office.
-Clown's office.
-Mime's office.
-Central Command ERT quarters.
-Central DS Spawn Area.
-White gloves for the fancy NT rep.
-Fancy pen for the Fancy NT rep.
-Added cameras in surgery and recovery wards
-Fixed maintenance area missing
-Central Command can no longer be blown open
-Fixed Robotics maintenance pipes, cables, waste pipes missing.
-Added chair and swiper in NT rep.
-Added chair and swiper in blueshield.
-Added swiper in the bridge.
-Added chair and additional security at NT rec.
-More water tanks in maintenance for firefighting
-Light in the PDA server room near the AI.
-Fixed security's mulebot flaps
 2014-08-11 01:51:34 -04:00
IcyV
f7e6f57a63 Allows for the antimov core to be created in research. 
Requires high and illegal research to reach, allows antimov modules to be created.
 2014-08-10 19:44:18 -07:00
IcyV
93f3f7b5ed Chem and overdose patch. 
Raises general overdose amounts. Lowers brute/burn damage from overdose. Removes the secondary anit-tox.
 2014-08-10 03:16:32 -07:00
VampyrBytes
896021c967 couple of fixes 
fixes MP's ending up with 2 heads on death
fixes cloning machine cloning species that are meant to be uncloneable
 2014-08-10 11:11:21 +01:00
Regory
f8ed5bf6b6 Sync Changes from Paradise Master 
Sync changes
 2014-08-09 18:48:19 -04:00
Regory
c497d8e1a9 Tajaran and Unathi shoes 
Stops Tajarans and Unathi from wearing sandals if they are a cyborg (no
feet) or a clown (clowns have large shoes)
 2014-08-09 18:41:40 -04:00
Regory
7ac1d76f80 Fixes equip_or_collect 
Equip_or_collect fixed to not delete the item being equipped.

Equip or Collect would use equip_or_del, and if failed, would try to
insert the item in a bag.  However, equip_or_del deletes the item, so it
cannot be put in the bag afterwards.
 2014-08-09 17:53:18 -04:00
alex-gh
808e908dc6 Merge pull request #365 from Artorp/chemisty-changes 
Chemisty quality-of-life changes
 2014-08-09 22:34:54 +02:00
Bone White
14f3bc7529 Added pda to strip menu 
PDAs can be stripped off or placed on a uniform now without having to
remove the uniform.
 2014-08-09 17:45:31 +01:00
Artorp
32d14b8307 Medical belt can load into fridge 
- Fixed compiling error with glass.dm

- Medical belt will load apropriate items into the medical fridge when
used on the fridge
 2014-08-09 03:18:31 +02:00
Artorp
4c59644d95 Enable medical belt quick pickup 
Using a medical belt on a bottle will attempt to pick up all bottles on
the tile.
 2014-08-09 02:51:15 +02:00
alex-gh
7b61b6563a Merge pull request #363 from Bone-White/master 
Added procedural slow to EVA suits
 2014-08-08 03:17:19 +02:00
Bone White
3e285690ae update for procedural eva slow 2014-08-08 02:11:44 +01:00
Bone White
9ffa4b8ee7 Added procedural slow to EVA suits 
Slow increases as pressure around them increases.  At higher than 80kPa
the slow is 4 units (as compared to diona's natural slow of 5)
 2014-08-08 01:39:42 +01:00
ZomgPonies
a812f3896c Vampyr, ya dun fucked up. Test your commits next time. 2014-08-07 20:19:42 -04:00
ZomgPonies
852f89dd0b Merge pull request #362 from VampyrBytes/master 
fix for #248 number 2
 2014-08-07 03:51:24 -04:00
ZomgPonies
e4d2cb53e4 Merge pull request #359 from Bone-White/master 
Rubber bullets now cause agony/halloss instead of stun
 2014-08-06 19:04:35 -04:00
ZomgPonies
6e67faf4fc Merge pull request #358 from VampyrBytes/master 
More MP fixes
 2014-08-06 19:04:26 -04:00
alex-gh
bbc9e51679 is_in_brig() fixes 2014-08-06 23:42:54 +02:00
Jeremy Liberman
a4196cb745 Add Vox Heist directive and call shuttle on completion of Directive X 
Conflicts:
	baystation12.dme
	code/controllers/emergency_shuttle_controller.dm
	code/modules/mob/mob.dm
 2014-08-06 23:12:24 +02:00
Bone White
f63a1995b8 Rubber bullets now cause agony/halloss instead of stun 
As title, by Mel's request.  Makes sense with the stunbaton nerf to nerf
rubber bullets too.  Two shots cause incapacitation (as opposed to three
from a taser).
 2014-08-06 20:41:31 +01:00
VampyrBytes
8504a13e33 fix for #248 number 2 
Last fix didn't work, this one should though
 2014-08-06 08:06:41 +01:00
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
VampyrBytes
5377a879b8 More MP fixes 
removed immunity to pressure that was added with overheating

MP will now revive when their heads are reattached
 2014-08-05 10:48:21 +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