cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-04-25 17:41:42 +01:00
Code Issues Packages Projects Releases Wiki Activity
22,199 Commits 11 Branches 2 Tags
355666e1a825252a4d08fa4e5cfced85e107ce39
Commit Graph

9304 Commits

Author SHA1 Message Date
Artorp
8aed91a98f Prevents template modification exploits 
Adds a check, if the value provided by the template isn't in the
possible color list it won't be used.
 2015-02-12 20:19:31 +01:00
Artorp
b4b7e9b6fd Canister flag fixes, name sanitization 
- Fixes update_flag to proper behavior

- Removed duplicate cases of update_icon()

- Adds text sanitazion, limits text length to name limit
 2015-02-12 19:56:05 +01:00
Markolie
4e2694cc03 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 2015-02-12 19:11:35 +01:00
Markolie
3f80f66411 Simplify get_candidates, minor adjustment to antag ages 2015-02-12 19:09:05 +01:00
ZomgPonies
cee11d4718 Attack log some cyborg killswitch stuff 2015-02-12 03:06:59 -05:00
ZomgPonies
d0d000160b And even moar nade logging from adminlog to attacklog 2015-02-12 02:44:28 -05:00
ZomgPonies
6cf4852a60 More nade logging from adminlog to attacklog 2015-02-12 02:41:33 -05:00
ZomgPonies
e9b413b1ff Moved broken/deanchored window logging from adminlog to attacklog 2015-02-12 02:16:55 -05:00
ZomgPonies
4d2ccff974 Moved bomb logging from adminlog to attacklog 2015-02-12 02:04:32 -05:00
ZomgPonies
239c996b1c Moved grenade logging from adminlog to attacklog 2015-02-12 01:58:34 -05:00
DZD
33b69df330 Objective bugfixes. 
- Should fix the assigning of the identity theft objectives
- Fixes changelings greentexting identity theft when they shouldn't.
- Possibly fixes AI name issue with destroy objective.
 2015-02-11 19:03:46 -05:00
Artorp
1c38527684 Added UI to cryo autoeject feature 2015-02-12 00:23:13 +01:00
ZomgPonies
20637ad9c9 Merge pull request #298 from TheDZD/changeling 
Changelinging/Objective Fixes [BUGFIX]
 2015-02-11 17:41:18 -05:00
DZD
017c63dfa2 Fixes 
- Fixes #294, #296.
- Purges use of 2 instead of DEAD when checking for stat in objective.dm
 2015-02-11 17:20:22 -05:00
Artorp
7e4e3acedc Added UI for new canister label system 2015-02-11 23:19:46 +01:00
Fox-McCloud
dbd2063561 Merge pull request #286 from FalseIncarnate/master 
[Feature] Food Carts
 2015-02-11 16:53:55 -05:00
Fox-McCloud
68772fd8f9 Merge pull request #295 from Markolie/master 
Revert camera caching
 2015-02-11 16:53:05 -05:00
Markolie
2250aeddff Revert camera caching 2015-02-11 16:11:32 +01:00
FalseIncarnate
72273b8f56 Food Cart Re-Sprite and Adjustments 
Swaps food cart sprite to use TG's food cart.
- Old sprite is present in code for possible future use.

Adds ability to wrench carts into place to prevent them from being
moved.

Food cart code adjusted to use lists instead of separate variables for
each slot.
- Slot variables have been commented out but left in code in case we
want to switch back for some reason.

Minor rearrangement of Janicart attackby checks to avoid potential
issues with trying to use wrenches or crowbars on the cart while a trash
bag is present.
 2015-02-10 23:32:59 -05:00
Fox-McCloud
2f965955ad Merge pull request #288 from TheDZD/changeling 
Minor Traitor/Ling Tweaks/Fixes [BUGFIX] [BALANCE]
 2015-02-10 21:37:15 -05:00
Fox-McCloud
c78368a3e8 Merge pull request #281 from ZomgPonies/master 
[BALANCE][BUGFIX] Singuloth Knight item balance & Small Bugfixes
 2015-02-10 21:35:48 -05:00
Fox-McCloud
c2f84b67f0 Merge pull request #279 from Markolie/master 
[BUGFIX] Add report_alerts variable to areas, zeroth law fix, cameranet code update
 2015-02-10 21:35:30 -05:00
Artorp
80112d8dec Fix canister N2O sprite 2015-02-11 00:20:50 +01:00
DZD
b3a0c9a975 Removes TABLEPASS and FPRINT flags 
- Also adds ABSTRACT and NODROP flags in preparation for removal of
canremove and abstract vars.
- Sorts some of the setup.dm flags so they're in order.
- Replaces 'flags & 2' in policetape.dm with pass_flags & PASSTABLE,
should have the same effect.
 2015-02-10 17:41:37 -05:00
Fox-McCloud
b977a74acb Merge pull request #290 from PJB3005/Canisters! 
canisters fix #2
 2015-02-10 16:14:47 -05:00
Fox-McCloud
6c1a5985e2 Merge pull request #284 from Artorp/DetectivePoliceTape 
Fixes detective policetape
 2015-02-10 15:58:24 -05:00
Fox-McCloud
8455ab84c4 Merge pull request #283 from Artorp/AmbienceSounds 
Fixes ambience sound preference
 2015-02-10 15:58:10 -05:00
Fox-McCloud
adf656f850 Merge pull request #271 from Svej/lapcharger 
[FEATURE] Laptop Recharger + Changelog button
 2015-02-10 15:57:50 -05:00
PJB3005
f14b5ee7a5 UGH 
I HATE YOU BYOND
 2015-02-10 21:44:30 +01:00
Markolie
97b75276fa Fix robot tracking 2015-02-10 17:26:35 +01:00
Markolie
64fe9e8600 Remove legacy viewpoint code, move back to Bay's and /tg/'s system 2015-02-10 17:02:27 +01:00
Markolie
c507158b8f Camera code update, fix runtime 2015-02-10 15:42:47 +01:00
DZD
03d0699637 Fixes runtime with getting inventory 
- Fixes runtime at living.dm line 195, when return_inv() is called for
suits and accessories that store items.
- Fixes use of 'stat == 2' instead of 'stat == DEAD' in objective.dm
 2015-02-10 09:25:54 -05:00
DZD
1d009e9c91 Destroy AI chance and Cling surgery 
- Decreased destroy objective chance from 10% to 4% for clings and
traitors. Should be so slightly rarer than hijack, so you should stop
seeing it every round.
- Changeling arm blades can be used as ghetto circular saws, this will
help changelings with their debrain objectives a bit, a ghetto scalpel
is easily found in the form of a glass shard already.
 2015-02-10 08:45:23 -05:00
FalseIncarnate
dd54bf52a4 [Feature] Food Carts 
Adds brand new Food Carts!
- Can carry 6 food items and 6 drink items
- One spawns in the kitchen, additional ones may be ordered from cargo
for 10 supply points each
- Thanks to Tigercat2000 for the base sprite image

Removes the OPENCONTAINER flag and transfer amount from the engicart.
- This resolves a runtime only Cole would encounter, but still won't let
him put vodka in the engicart.
 2015-02-10 07:32:14 -05:00
ZomgPonies
3cb4f40d87 Fixes #282 2015-02-10 05:40:48 -05:00
Artorp
e3de04412e Fixes detective polietape 2015-02-10 07:47:58 +01:00
Artorp
d708d53a6c Fixes ambience sound preference 2015-02-10 07:32:14 +01:00
ZomgPonies
39619bdf62 Tuned Singuloth Knight item balance. 2015-02-09 22:41:20 -05:00
Markolie
3a4679bce7 Remove zeroth law with own board 2015-02-10 03:06:43 +01:00
Markolie
26d0de51bb Add report_alerts variable to areas 2015-02-10 02:07:02 +01:00
DZD
4e93cc5203 Merge with upstream/maser 2015-02-09 18:22:19 -05:00
Fox-McCloud
4821f6e349 Merge pull request #276 from TheDZD/minor-fixes 
Minor Traitor Objective Fixes [Balance] [Bugfix]
 2015-02-09 18:15:16 -05:00
Fox-McCloud
2e57ef5f01 Merge pull request #272 from Markolie/master 
[FEATURE][REFACTOR] Accessory changes, R&D search function
 2015-02-09 18:14:58 -05:00
Markolie
ca90eca6f1 Replace surgical drill in syndicate medikit with combat defib 2015-02-09 23:36:54 +01:00
DZD
e900f12d8c Destroy AI Name Fix 
- Target AI will now show name after the AI changes its name, rather
than its original name.
 2015-02-09 16:43:05 -05:00
DZD
59975a1949 Flat chance for Destroy AI 
Prevents problem with it always being assigned mid-round due to the
num_players() proc being designed for roundstart.
 2015-02-09 16:15:21 -05:00
DZD
2df5e97a7e Flat chance for Destroy AI 
num_players() proc isn't particularly nice during autotraitor, flat 10%
chance instead.
 2015-02-09 16:07:18 -05:00
DZD
879190b98b Minor objective fix 
- Fixes traitors with the exchange/backstab objectives getting the "die
a glorious death" objective.
 2015-02-09 15:56:21 -05:00
DZD
4e15500d45 Decrease chance for Destroy AI objective. 
A lot of autotraitor/traitor+ling rounds have had most of the traitors
having to kill the AI.
 2015-02-09 15:53:04 -05:00