cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-25 17:51:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
48,378 Commits 26 Branches 2 Tags
094934a49b153f36c96d88f320ddc33e8dc32c07
Commit Graph

35094 Commits

Author SHA1 Message Date
Terilia
faeaab739b And adjusting the scope to reset the cycles. 2020-07-06 12:36:38 +02:00
Terilia
d58dce3bb0 Fixed the very obvious and annoying bug 2020-07-06 12:29:36 +02:00
variableundefined
c0587b7e07 Merge pull request #13770 from Fox-McCloud/new-player-gc-continued 
Further New Player GC Fixes
 2020-07-06 03:24:21 -04:00
Fox McCloud
23e594b246 Merge pull request #13773 from Gatchapod/hydro-SR-fix 
Fixes SR spawning mobs in nullspace instead of hydroponics trays
 2020-07-05 14:38:32 -04:00
Gatchapod
5cfc0e1e85 this is objectively a superior way of doing it 2020-07-05 20:01:06 +02:00
Gatchapod
4fd4a949aa no more nullspace tomatoes and trees 2020-07-05 15:06:04 +02:00
AffectedArc07
1283bc9022 Message Tweaks 2020-07-05 08:35:45 +01:00
Fox McCloud
e3793a14ee Further New Player GC Fixes 2020-07-05 01:21:09 -04:00
variableundefined
a545a13ed4 Merge pull request #13747 from Fox-McCloud/new-player-gc 
Makes New Players GC
 2020-07-04 21:27:15 -04:00
variableundefined
eaee2365ea Merge pull request #13742 from Fox-McCloud/fix-mob-init-args 
Fixes Mob Init Arguments and Returned Values
 2020-07-04 21:23:12 -04:00
variableundefined
db0d3b3e45 Merge pull request #13749 from Fox-McCloud/whyyyyyy 
No Destroying Things Directly
 2020-07-04 21:20:28 -04:00
Fox McCloud
cb29647522 Merge pull request #13761 from farie82/ai-fixes 
Fixes borgs being given to the last AI and a runtime
 2020-07-04 17:17:57 -04:00
AffectedArc07
f8c74b95f9 Mochi Tweaks 2020-07-04 21:37:29 +01:00
AffectedArc07
dbdd1f0987 Allows clients to reload their UI assets 2020-07-04 21:23:38 +01:00
Fox McCloud
1d11ff40e7 Merge pull request #13763 from farie82/blob-antaghud-fix 
Makes blobs not add new_players to the HUD list. Fixing AHUD
 2020-07-03 16:46:25 -04:00
Fox McCloud
cf4450e3b3 Merge pull request #13756 from AffectedArc07/deletes-zombies 
Obliterates Zombies
 2020-07-03 16:34:27 -04:00
joep van der velden
ae778d3810 Makes blobs not add new_players to the HUD list 2020-07-03 22:25:43 +02:00
joep van der velden
8dda2766c6 fixes show_borg_info and select_active_ai_with_fewest_borgs 2020-07-03 20:57:37 +02:00
denghis1
7c976a7c98 cleans up the defused part of process() a little 
Removes countdown.stop and stop_processing from the else if (defused) part, since this will be run on next tick of process() no need to run this twice.
Also removes the defused part of if(defused && (payload in src)) since we already check for defused above
 2020-07-03 20:34:11 +02:00
denghis1
82c6595926 fixes syndicate bomb not triggering defuse properly 
Moves active = false from wires\syndicatebomb\UpdateCut()
to machinery\syndicatebomb\process()
removes a redundant check for if the bomb is not active in machinery\syndicatebomb\process()
This fixes the bomb not triggering payload.defuse() in process(), and thus makes the training bomb actually work again
 2020-07-03 19:30:04 +02:00
Fox McCloud
76863b4f49 Merge pull request #13759 from Deelite34/Doing-things-to-Paradise 
Fixes typos in space pod action text and a hat description
 2020-07-03 06:41:43 -04:00
denghis1
29045e16dc closet attack_ai check for user.loc /obj/machinery/atmospherics 
Checks if the user.loc type is part of/obj/machinery/atmospherics machines (pipes, vents etc) this prevents a ventcrawling maintenance drone from opening lockers.
 2020-07-03 11:09:56 +02:00
Deelite34
e2bd916425 Fix typos 
Fixes typos in baseball cap and searching for items under seat in space pod.
 2020-07-02 23:09:40 +02:00
denghis1
846b479686 bugfix, scopes lawyers_badge/attack_self properly 
Scopes the attack_self of the lawyers_badge to that accessory, instead of setting it on every single accessory, thus preventing everyone from being able to pretend that they are an attorney
 2020-07-02 22:48:52 +02:00
AffectedArc07
e305530d59 Obliterates Zombies 2020-07-02 21:22:55 +01:00
Fox McCloud
07a864f4a0 Merge pull request #13746 from denghis1/bugfix_swarmer_eating_podbay_barrier 
Prevent swarmers from eating the podbay energy barrier
 2020-07-02 11:41:57 -04:00
AffectedArc07
748b8e88e1 Merge branch 'master' into hook-kill-v10-final-ultimate-final 2020-07-02 11:17:30 +01:00
SteelSlayer
b1bbee618f oops 2020-07-01 22:34:24 -05:00
SteelSlayer
e58b11356d L.W.A.P this bitch into shape 2020-07-01 20:36:46 -05:00
Fox McCloud
f1f7610c4d client cleanup 2020-07-01 13:46:09 -04:00
Fox McCloud
b94c07b797 No Destroying Things Directly 2020-07-01 13:33:46 -04:00
Fox McCloud
0d7d639a0d Fixes Lighting (#13745) 2020-07-01 11:26:38 -06:00
Fox McCloud
8852a9de58 Makes New Players GC 2020-07-01 10:45:42 -04:00
AffectedArc07
9ff59fcc0f Merge branch 'master' into nanomaps-github-action 2020-07-01 15:42:53 +01:00
denghis1
c709b13345 Prevent swarmers from eating the green podbay door energy barrier 
Prevents swarmers from eating the spacepoddoor, green energy field. This could be eaten to open up a way into space for swarmers
 2020-07-01 15:54:10 +02:00
denghis1
71501580dd Timer set to use default value 
Timer for wrenching changed from 120 the use the proc default instead of 20, this brings it in line with most other wrenchable objects
 2020-07-01 13:20:49 +02:00
denghis1
6d6091c0e2 Added wrench_act to slot machines, so that they can be moved by the crew 
Added the section of code that is used on pretty much every wrenchable machinery to the slot machines, so that they can now be moved and wrenched down again. Wrench time set to 120 to make it take a tad longer than most things to unwrench/wrench.
 2020-07-01 09:29:10 +02:00
Fox McCloud
cd5da7494c Merge pull request #13743 from AffectedArc07/fixes-admin-note-log-search 
Fixes note search log + Minor TGUI fix
 2020-07-01 03:14:01 -04:00
AffectedArc07
37f1cf5ee9 Fixes note search log + Minor TGUI fix 2020-07-01 07:48:46 +01:00
Fox McCloud
ad210368b9 Merge pull request #13730 from Gatchapod/isSynthetic-removal 
Removes isSynthetic() helper, replaces its instances with ismachineperson()
 2020-07-01 00:12:23 -04:00
Gatchapod
3e6ad37661 renaming it is a good idea, too 2020-07-01 05:25:49 +02:00
Fox McCloud
20772d2899 Fixes Mob Init Arguments and Returned Values 2020-06-30 22:30:08 -04:00
Fox McCloud
58c57011b0 Merge pull request #13606 from CornMyCob/feet 
clean_blood refactor
 2020-06-30 20:28:20 -04:00
Fox McCloud
2e2e3a2919 Merge pull request #13720 from dearmochi/armor-vv 
Add ability to VV an object's armor easily
 2020-06-30 20:02:12 -04:00
Fox McCloud
33af3fac4f Fixes Random Drugs failing Travis and Maint Loot (#13719) 2020-06-30 17:58:12 -06:00
Fox McCloud
a996e55b47 Merge pull request #13736 from denghis1/headcrab_fix_dead_eating 
Headcrab Bug, eating while being dead. Bug, sometimes display wrong name while eating
 2020-06-30 19:56:48 -04:00
Fox McCloud
c2636e2196 Merge pull request #13740 from Kyep/zipties_fix 
Fixes #13734 - generalist borg zipties
 2020-06-30 19:54:30 -04:00
Fox McCloud
efbf276fed Merge pull request #13741 from Aidenzack1/grammer_fix 
AFK grammar fix
 2020-06-30 19:54:00 -04:00
Fox McCloud
e438ff4d36 Makes Mobs Lazier and Removes Hard References (#13693) 
* Makes Mobs Lazier and Removes Hard References

* fluff
 2020-06-30 17:52:28 -06:00
Fox McCloud
0dea896023 Minor Turf Refactor (#13690) 
* Turf GC

* might as well do this

* additions

* Bay being bay
 2020-06-30 17:47:09 -06:00