cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-31 12:41:46 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,040 Commits 26 Branches 2 Tags
2fe3a3470f613e07c40586c2d990e7ea745e2f7d
Commit Graph

1681 Commits

Author SHA1 Message Date
Fox McCloud
b831dbc8a3 Merge pull request #5474 from FlattestGuitar/hoodies 
Fixes old chaplain hoodies existing
 2016-08-17 16:17:22 -04:00
Mieszko Jędrzejczak
cb33fdc79e Goshdurn hoodies 2016-08-17 20:05:05 +02:00
Fox McCloud
0b056ec85b Merge pull request #5471 from Crazylemon64/vv_list_fix 
Reverts to the simpler VV list checker
 2016-08-17 00:26:11 -04:00
Crazylemon64
19a5ee350f Simpler's better 2016-08-16 21:10:26 -07:00
Fox McCloud
eda5549d2d Merge pull request #5382 from Ty-Omaha/Features 
Allows Sechailer Phrases to be Selectable
 2016-08-14 22:28:56 -04:00
Crazylemon64
e38a0a1d64 Cleaner associativity viewing 
We've got a cap of 500 elements on lists we're looking at, so this isn't
going to break the bank
 2016-08-14 11:33:33 -07:00
Crazylemon64
1bba2ba41f Makes the thing SLIGHTLY more robust. Not impossible to fool, though 2016-08-14 11:06:00 -07:00
Crazylemon64
01d4de04ac Adds monster's enhancement 2016-08-14 10:59:27 -07:00
Crazylemon64
02b0d643c1 Don't make fixes at 2 in the morning 2016-08-14 09:44:59 -07:00
Crazylemon64
cce439d205 Fixes the VV list view 2016-08-14 02:43:14 -07:00
Fox McCloud
739cf9102b Merge pull request #5339 from IcyV/Chameleon-Flag 
Adds an explosive chameleon-flag for traitors
 2016-08-12 18:59:31 -04:00
TheDZD
e944f176d6 Merge pull request #5418 from Fox-McCloud/malf-ai-rework 
Malf AI Rework
 2016-08-12 18:30:41 -04:00
monster860
19460ff4af Makes boldnotice and danger classes be be used 2016-08-11 12:20:02 -04:00
Fox-McCloud
41a74fb865 Malf AI Rework 2016-08-11 05:16:06 -04:00
Ty-Omaha
35ccf346a7 Stuff 2016-08-10 21:47:37 -04:00
Tigercat2000
58103757cc Merge remote-tracking branch 'upstream/master' into GAMEMODE_CODE_AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA 
Conflicts:
	code/game/gamemodes/newobjective.dm
	code/game/gamemodes/objective.dm
 2016-08-10 14:16:42 -07:00
Crazylemon64
1b93ce9b8b Merge branch 'master' of github.com:ParadiseSS13/Paradise into space_allocation 2016-08-10 11:02:05 -07:00
Krausus
906a3d3ba2 Fixes noclothes check on mindless mobs' spells 2016-08-09 03:44:09 -04:00
Fox McCloud
607642d4ef Revert "Refactors Markings, Adds Tail (some body and head) markings, Adds Alt heads, Secondary (F)Hair Themes, Darkens Vulp/Taj + Unathi horns/frills, Sprite adjustments and more..." 2016-08-08 23:26:51 -04:00
Ty-Omaha
96d45c4505 Sechailer1 2016-08-08 22:32:50 -04:00
Fox McCloud
86d0c0b2b9 Merge pull request #5147 from KasparoVy/tail-markings 
Refactors Markings, Adds Tail (some body and head) markings, Adds Alt heads, Secondary (F)Hair Themes, Darkens Vulp/Taj + Unathi horns/frills, Sprite adjustments and more...
 2016-08-08 21:58:45 -04:00
Tigercat2000
0821e5bd04 Merge remote-tracking branch 'upstream/master' into GAMEMODE_CODE_AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA 
Conflicts:
	code/game/gamemodes/objective.dm
 2016-08-08 06:21:02 -07:00
Crazylemon64
031dd2bb3d Iiiiit's merge conflict time! 
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_allocation
 2016-08-07 23:42:02 -07:00
TheDZD
bc2ce6a7b0 Merge pull request #5349 from Fox-McCloud/headphones 
Adds in Headphones
 2016-08-07 22:58:35 -04:00
Fox-McCloud
f5826a0c2b Adds in Headphones 2016-08-06 19:55:08 -04:00
Fox McCloud
7bc9b0c47f Merge pull request #5295 from chopchop1614/feta 
Fixes horsemask bug
 2016-08-06 06:57:38 -04:00
chopchop1614
346dd3cd70 Update horsemask.dm 2016-08-06 11:32:54 +01:00
chopchop1614
5ea4d4ab2f Update horsemask.dm 2016-08-06 11:32:26 +01:00
IcyV
28d63f03d0 Adds an exploding chameleon flag for traitors 
This gives traitors a 7TC chameleon flag. It can be used once to be
disguised as any other flag on the station. It comes with an explosive
payload equivalent to a minibomb. It explodes once the flag finishes
burning. By default it looks like a standard NT flag that has a separate
name and description by default.

Would have re-opened #5281 instead but things went horribly wrong on my
local side.

🆑 IcyV
add: Adds an exploding chameleon flag for traitors.
/🆑
 2016-08-05 13:32:32 -07:00
Chakirski
6dca3112b3 The fact this is inconsistent hurts me. 2016-08-04 11:29:26 -05:00
chopchop1614
2f5f28cc36 fixes the fix 2016-08-02 19:17:22 +01:00
chopchop1614
7f2f40d0bd Fixes horsemask 2016-08-02 19:00:04 +01:00
Tigercat2000
9f3cdb43f7 special_role/objective refactor 
Refactored most instances of special_role setting/checking to use new
SPECIAL_ROLE_X defines in code/__DEFINES/gamemode.dm

Removed relative pathing from objective.dm and split large if statements
into multiple, plus a bunch of styling fixes

Refactored every instance of `istype(ticker.mode` into a GAMEMODE_IS_X
define in code/__DEFINES/gamemode.dm. Done primarily for when someone gets
around to making gamemode code less AWFUL
 2016-08-01 21:29:19 -07:00
Crazylemon64
bc93078da5 Merge conflicts begone 2016-08-01 18:28:47 -07:00
TheDZD
0cc2051f8a Merge pull request #5251 from Fox-McCloud/fire-system 
Implements Fire System
 2016-08-01 19:39:50 -04:00
Crazylemon64
c48d216ebc Fixes negated conditions 2016-08-01 14:25:38 -07:00
Crazylemon64
bf2bcbce67 Removes most hard-coded z level checks 2016-07-31 21:29:03 -07:00
Fox McCloud
31ad2a84f2 Merge pull request #5132 from Kyep/atmos_grenades 
Atmos Grenades (aka: how to kill people with atmos)
 2016-07-31 22:40:03 -04:00
Fox McCloud
4c40a74746 Merge pull request #5254 from Crazylemon64/space_allocation 
Updates space transitions and integrates it with the space management module
 2016-07-31 12:18:19 -04:00
TheDZD
026a28f9e7 Merge pull request #5250 from Krausus/biconclassfix 
Fixes Weirdly Specific View Variables Crashes Somehow
 2016-07-31 11:44:54 -04:00
IcyV
da360c8703 Gives Atmos-Traitors a new fireaxe. 
Give Atmos-traitors a unique 10TC axe to buy.

This axe starts with a single charge and can gain more charges over time
by destroying windows and grilles. Each grille or window destroyed has a
4% chance of giving another charge to the axe. On a charged hit the axe
will hit for 30 brute and 30 burn. It will otherwise function as a
normal fireaxe if out of charges.

![nknwxga](https://cloud.githubusercontent.com/assets/6348574/17047510/9ab3c986-4f93-11e6-83b8-c3e4598704eb.gif)

Sprites courtesy of Fullofskittles
🆑 IcyV
add: Adds a unique axe for Atmos-traitors
/🆑
 2016-07-29 21:08:50 -07:00
Crazylemon64
ae43de3652 Integrates the z level manager with the space transition system 2016-07-29 19:11:36 -07:00
Fox-McCloud
bde5755916 Implements Fire System 2016-07-29 13:24:09 -04:00
Krausus
f4e824e4c3 Adds no-class mode to bicon proc 
... and makes the bicons in View Variables use it. This seems to stop a
small number of icon state classes from breaking Dream Seeker when
directly browsed to a client. I don't actually understand why, but it
works.
 2016-07-29 09:00:07 -04:00
KasparoVy
39d3d64207 Staying up to date. 2016-07-28 17:02:07 -04:00
TheDZD
36e7ab6251 Merge pull request #5204 from Fox-McCloud/virology-tweaks 
Virology Tweaks
 2016-07-28 15:40:23 -04:00
Fox McCloud
755ca2ee68 Merge pull request #5190 from Kyep/vamp_dethrall 
Adds admin button to remove vamp thrall status
 2016-07-26 06:28:37 -04:00
Fox-McCloud
cd544bee34 Virology Tweaks 2016-07-26 05:48:36 -04:00
Fox McCloud
e491fe33d2 Merge pull request #5178 from Krausus/biconizeVV 
Replaces View Variables' Browsed Icons With Bicons
 2016-07-26 03:42:21 -04:00
Kyep
93bcbee527 Uplink item description tweak 2016-07-24 21:23:06 -07:00