cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-29 19:52:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,139 Commits 26 Branches 2 Tags
3a5b87b00a8d95757cc35dffa90177fd0fae23f4
Commit Graph

7488 Commits

Author SHA1 Message Date
Markolie
a99b4ece15 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into zefix 2017-03-16 22:36:00 +01:00
Fox McCloud
c6e3fe3cdb Merge pull request #6734 from uraniummeltdown/plastic 
Plastic is not a mineral anymore, plastic flaps can be constructed/deconstructed
 2017-03-15 06:33:02 -04:00
Markolie
4edf69c3c0 Revenant nightvision fix 2017-03-12 20:59:28 +01:00
uraniummeltdown
85260a72ba plastic is not a mineral anymore, plastic flaps are deconstructible, new construction.dm construction defines 2017-03-12 06:09:29 +04:00
Crazy Lemon
9de6d25f07 Merge pull request #6696 from davipatury/hallo-2 
Hallucinations 2.0
 2017-03-11 15:33:47 -08:00
Crazy Lemon
661939c145 Merge pull request #6691 from davipatury/rcl 
Port's RCL from /vg/
 2017-03-11 15:30:48 -08:00
Crazy Lemon
175a4475f0 Merge pull request #6676 from KasparoVy/TailMarkingFix 
Fixes a Bug With Tail Markings
 2017-03-11 15:27:57 -08:00
Fox McCloud
3c7d990061 Merge pull request #6710 from uraniummeltdown/coverflags 
Cleaned up clothing flags
 2017-03-11 04:57:15 -05:00
uraniummeltdown
9eb7eea1e9 removes fourth argument air_group of CanPass() as it's not used and is a leftover from FEA 2017-03-10 22:46:02 +04:00
Markolie
0bc0a2c461 All types of crystals 2017-03-10 12:45:47 +01:00
Markolie
cf4f350a79 Let matter grippers carry firelock electronics and bluespace crystals 2017-03-10 12:44:37 +01:00
uraniummeltdown
dd12fbe13a new flags_cover var for clothes, adjust existing flags 2017-03-10 11:33:42 +04:00
Markolie
a376adc93e Merge branch 'zefix' of https://github.com/Markolie/Paradise into zefix 2017-03-09 17:42:21 +01:00
Markolie
7cb52433d1 Fix AI blind issue 2017-03-09 17:41:46 +01:00
Mark van Alphen
93470e3570 Merge branch 'master' into zefix 2017-03-09 17:20:31 +01:00
davipatury
2a9bcde361 Fix conflicts. 2017-03-09 12:01:50 -03:00
Markolie
acab5d5170 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into toolz 
# Conflicts:
#	code/game/objects/items/weapons/storage/bags.dm
#	code/game/objects/items/weapons/storage/uplink_kits.dm
#	code/game/objects/items/weapons/storage/wallets.dm
 2017-03-08 10:45:16 +01:00
Crazy Lemon
6e7338a573 Merge pull request #6688 from Allfd/bible 
Makes bible farting less predictable
 2017-03-08 00:24:44 -08:00
Fox McCloud
f96c335d1f Merge pull request #6704 from uraniummeltdown/hardsuit 
Rename all "rigs" (hardsuits) to hardsuits
 2017-03-07 23:35:07 -05:00
Fox McCloud
5a9ff41464 Merge pull request #6591 from Crazylemon64/ipc_power_cord 
Replaces the IPC APC grabbing thing with a power cord and lets IPCs be genderless
 2017-03-07 22:25:11 -05:00
uraniummeltdown
dc6f9f5506 rename all hardsuits (called rig in multiple places) to hardsuit, rename rig.dm to hardsuit.dm, adjust icon states from rig to hardsuit, move paranormal hardsuit mob sprites out of own file, add wiz hardsuit helm and suit inhands 2017-03-07 20:55:43 +04:00
Markolie
3aa1399995 Implement usesound/toolspeed 2017-03-07 16:46:28 +01:00
davipatury
c1a73eb095 Hallucinations 2.0 2017-03-06 18:41:15 -03:00
Markolie
3b73053bc4 Tool fixes 2017-03-06 20:46:24 +01:00
Markolie
9d9e957df1 Tool overhaul (usesound & toolspeed), wire descriptions/ghost interaction, add additional tools, refactor can(t)_hold 2017-03-05 19:53:20 +01:00
davipatury
a913797bf1 RCL 2017-03-05 13:22:55 -03:00
Markolie
02c4cd26f4 Final fixes 2017-03-05 16:42:14 +01:00
Markolie
e6b39c3185 Fixes 2017-03-05 14:31:26 +01:00
Fox McCloud
03b5a5efaa Merge pull request #6660 from uraniummeltdown/monkey 
Allows monkeys to use all guns
 2017-03-05 03:03:45 -05:00
Alffd
35f34a3a24 Removes adminlog 2017-03-04 17:34:36 -05:00
Alffd
900aeb1239 Makes bible farting less predictable 2017-03-04 16:38:15 -05:00
Crazy Lemon
0d5d8e6cbe Merge pull request #6597 from davipatury/wires-ui 
Wires Nano-UI-ification
 2017-03-04 10:21:19 -08:00
Crazy Lemon
5e1bd050f8 Merge branch 'master' into adminin 2017-03-03 23:23:40 -08:00
KasparoVy
181878e1ef Fixes a Bug With Tail Markings 
The bug occurred if a changeling assumed the identity of a character who
had a body-accessory and a tail marking specific to that body accessory
or if the person with the body accessory and marking got cloned. This
would result in a ling/player with the default tail but they'd still
have whatever marking they/the person used to have, both looking ugly
and being metagamable.
 2017-03-03 22:38:13 -05:00
uraniummeltdown
4d80e4ac36 allow monkeys to use guns 2017-03-02 20:45:42 +04:00
TravellingMerchant
bc06adc562 Adds the new Cyborg sprites to the sprite select list. 2017-03-02 13:25:46 +00:00
Fox McCloud
e41b09d876 Merge pull request #6622 from Kyep/terrorspiders-PR4 
Terror Spiders 4 - Fixes & Tweaks
 2017-03-01 18:29:53 -05:00
Fox McCloud
33b7213065 Merge pull request #6613 from Crazylemon64/autopsy_data 
Adds stuff to autopsy
 2017-03-01 18:23:11 -05:00
Fox McCloud
3ec0afeecf Merge pull request #6639 from KasparoVy/multivox-plasmaverse 
Properly Equips Plasmaman & Vox Multiverse Copies
 2017-03-01 18:22:09 -05:00
Fox McCloud
eb7edab605 Merge pull request #6364 from Aurorablade/NerfsPowerNaps 
Stop Dashing Waves
 2017-03-01 18:21:21 -05:00
KasparoVy
88669090a6 Properly Equips Plasmaman & Vox Multiverse Copies 2017-02-28 04:37:10 -05:00
KasparoVy
f425f0ae4e Plasmaman Suit only extinguishes when you're on fire. 
Had to make it disregard negative firestacks because showers (and
probably some other things). This check is extremely similar to one just
a few lines above, so it makes sense.
 2017-02-28 00:50:03 -05:00
Kyep
66ee1659b6 Post-PR-3 bugfix & rebalance pass 
Changes:
1) Fixes wireless AEGs being able to be recharged in conventional
rechargers. This prevents people with recharger access using them as
regular laserguns.
2) Fixes spiderlings from dying Mother of Terrors lingering around for a
long time. Now, they're forced to ventcrawl immediately if they can.
3) Improves queen health regen. She was regularly getting picked off by
one guy with a gun or two.
4) Queen and Mother now gain vent smash ability. Given how often the
crew welds literally every vent, this is necessary to avoid them being
totally shut out of the vent system in the late game.
5) Prince loses vent smash ability. Instead, he gets the ability to spin
thicker (vision-blocking) webs, and +10 melee damage.
6) Fixes 'evil looking spiderling' meta by requiring that queen has laid
at least 10 eggs before the ability is usable, so newbie queens
don't use it first thing and instantly get discovered/swarmed.
7) Adds confirmation prompt to queen nesting. Queens will no longer be
confused about why the cannot ventcrawl after nesting.
8) Reduces the chances of terror spiderlings skittering onto space
tiles. Makes them less likely to space themselves.
9) Tweaks TS event by increasing timer, and having one of the possible
infestation types spawn 4, rather than 3, green terrors.
 2017-02-26 21:42:45 -08:00
Crazylemon64
6ec6c90aad Allows IPCs to express themselves as a gender again 2017-02-26 12:06:16 -08:00
Crazylemon64
31417488c4 Adds hooks in Adjust*Loss to support autopsy 2017-02-26 09:43:00 -08:00
Crazylemon64
c0ae16c695 Electrocution is now tracked in autopsy 2017-02-26 00:03:15 -08:00
Crazylemon64
26bfc2c1b7 Removes IPC gender 2017-02-25 22:49:36 -08:00
Aurorablade
414f83bb98 Krasues Tweaks 2017-02-25 23:45:15 -05:00
Crazy Lemon
186edb14e7 Merge pull request #6468 from tigercat2000/job_refactor_tg 
Ported /tg/'s outfit datums, refactored job controller to support them
 2017-02-25 17:54:01 -08:00
Crazy Lemon
992fae8cf5 Merge pull request #6500 from davipatury/secure_data-ui 
Security Records Nano-UI-ification
 2017-02-25 16:59:59 -08:00