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

13931 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
Ccomp5950
3ca02d3c5b Fixed the font tag on mouse traps description. 
Conflicts:
	code/game/objects/items/weapons/storage/boxes.dm
 2014-08-16 20:53:29 -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
ZomgPonies
d28ed3f9a0 Merge pull request #388 from Bone-White/master 
Altered disarm knockdown …
 2014-08-16 17:45:02 -04:00
Bone White
140db57ba4 Adds a sound when nations mode is announced 
Not tested because I can't force nations without server pop.
 2014-08-16 22:09:49 +01:00
Bone White
d882485376 T-Ray scanner var improvement 
Allows tray scanner range and pulse duration to be controlled by vars.
Added three upgraded tray scanners, with increased range, increased
pulse duration, and both of these features.
 2014-08-16 08:46:48 +01: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
IndexLP
bb3c162718 Fixes for the berets so they dotn float above the players head when veiwed from behind, and minor chnages to the behind profile to make them look better in addition to not floating. 2014-08-15 01:46:48 -04: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
6c25320a71 Merge pull request #378 from Bone-White/master 
New icon for pipe freezer
 2014-08-11 21:09:41 -04:00
Bone White
69122ab55e New icon for pipe freezer 
icon by pancakeflipper
 2014-08-12 02:04:07 +01:00
MrStonedOne
95f30bc640 Fixes sql errors caused by odd and unexpected behavor in dbcon.Quote() 2014-08-11 20:56:31 -04:00
MrStonedOne
c0b8e02eee SQL injection fix. 
Google sanitizing sql input. almost every single article explains why you should never attempt to roll your own function to do this.
 2014-08-11 20:56:10 -04:00
ZomgPonies
e08fb5d1d0 Merge pull request #377 from Bone-White/master 
Further atmos changes
 2014-08-11 20:38:52 -04:00
ZomgPonies
2feedafaae Merge pull request #375 from VampyrBytes/master 
couple of fixes
 2014-08-11 20:38:11 -04:00
ZomgPonies
bbcd97ba83 Merge pull request #372 from Artorp/window-construction-changes 
Window construction changes
 2014-08-11 20:37:30 -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
Bone White
ea1feb41dd Further atmos changes 
mixers and filters no longer have density = 1, so mobs can walk over
them.
new item: pipe freezer, can temporarily freeze pipes to allow
unwrenching when over the threshold internal pressure
note: has a temporary skin of hand labeler, needs a new sprite really.
 2014-08-11 17:45:18 +01: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
Artorp
d0447f061a Fixes states of onedirectional windows 
Will only change the reinforced plasma window. You don't have to pry
them out of a frame before anchoring them anymore.
 2014-08-11 01:51:10 +02:00
Artorp
048f5235c9 Plasma construction and full window fixes 
- Fixed plasma window construction

- Fixed full windows from stopping players and gasses from moving above
them even with density set to 1
 2014-08-11 01:06:27 +02:00
Artorp
6c5b0f7987 Windows can now be disassembled 
- Using a wrench on a deanchored window will deconstruct it
 2014-08-10 21:51:06 +02: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
alex-gh
ae1b1970d7 Merge pull request #368 from Artorp/master 
Station Blueprints fix
 2014-08-09 22:34:42 +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
5a22e5e8dd Station Blueprints fix 
Fixes the station blueprints.
 2014-08-09 09:24:02 +02:00
Artorp
c0378f1434 Added: Pill bottle emptying into fridge 
- Drag pill bottle sprite onto fridge to empty it

Code for batch filling of fridge is re-used from similar uses of plant
bag and ore bag.
 2014-08-09 04:36:37 +02: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