cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-05-13 02:10:39 +01:00
Code Issues Packages Projects Releases Wiki Activity
20,570 Commits 13 Branches 2 Tags
85a8a7a35ff38b7513c1939f8ea7eaec399d86eb
Commit Graph

2117 Commits

Author SHA1 Message Date
ZomgPonies 91e8b909c0 Squish Squash 2015-04-04 14:27:53 -04:00
Fox-McCloud b3270fe360 Merge pull request #650 from ZomgPonies/beartraps 
IED fix and trap
 2015-03-25 09:37:08 -04:00
Fox-McCloud e45a5ac46a Prox Mine Fix 2015-03-25 00:27:11 -04:00
ZomgPonies 8dfaa39ecb Updates PR with Fox's suggestions 2015-03-24 19:27:05 -04:00
ZomgPonies 3f51d1135a Re-adds old IED recipe, allows IED -> Beartraps 2015-03-24 09:10:10 -04:00
SamCroswell efd546d1e4 Ninja glove icon update, ninja suit toggle function 2015-03-07 19:54:00 -05:00
ZomgPonies 7799470ca5 Merge pull request #460 from Markolie/master 
Add bandanas, mask toggling, camo armor jacket, minimum drone/ERT age, turret update, NanoUI update and bugfixes
 2015-03-01 12:30:15 -05:00
ZomgPonies 5a94b87331 Merge pull request #457 from Fox-McCloud/Cameras 
Camera Update+Camera Bugs
 2015-03-01 12:28:58 -05:00
Markolie b28f791f8f (Porta) turret update, map area update 2015-03-01 02:10:32 +01:00
Fox-McCloud 62462c876f Camera Update+Camera Bugs 2015-02-28 04:01:14 -05:00
Fox-McCloud 923ba5932f RnD Fixes and Tweaks 2015-02-27 17:36:20 -05:00
ZomgPonies 710d60abda GC fixes 2015-02-25 10:58:56 -05:00
Markolie 672305e034 Adds a "params" parameter to attackby(), so it keeps track of pixel_x and pixel_y among other things 2015-02-22 22:12:11 +01:00
Markolie 3b072b5a62 Remove click delay from most things 2015-02-22 18:47:58 +01:00
Markolie d8d1670b68 Revert "Revert "Saycode/language/species port from Bay"" 
This reverts commit d54579850c.

Conflicts:
	code/game/gamemodes/nuclear/nuclearbomb.dm
	code/game/objects/items/devices/radio/intercom.dm
	code/modules/mob/living/silicon/pai/pai.dm
 2015-02-20 17:46:35 +01:00
DZD 212ca5f5bd MERGE CONFLIIIIIICTS 2015-02-19 20:26:36 -05:00
ZomgPonies d54579850c Revert "Saycode/language/species port from Bay" 2015-02-19 20:15:42 -05:00
DZD d0d6c8eebd Merge with upstream/master 
Fixes merge conflicts.
 2015-02-19 19:38:48 -05:00
DZD 4bcdb94a99 Merge with upstream/master 
Fixes conflicts
 2015-02-18 13:41:32 -05:00
Markolie 21926c9e48 Part 1 of saycode/language/species port from Bay 2015-02-17 23:20:50 +01:00
Markolie ad167dc541 Announcement system overhaul, crew monitor system overhaul, add portable crew monitor 2015-02-16 19:03:29 +01:00
Markolie 9fed8135d4 Handcuff refactor, IV drip fix 2015-02-14 04:35:32 +01:00
DZD a4cda9287f Merge with upstream/master 2015-02-12 16:43:01 -05: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
Markolie 64fe9e8600 Remove legacy viewpoint code, move back to Bay's and /tg/'s system 2015-02-10 17:02:27 +01:00
Markolie 7285f39fc1 Defib update, cell path update 2015-02-09 16:12:01 +01:00
Markolie 956f2ba703 Event overhaul from Bay, atmos fixes 2015-01-21 23:05:59 +01:00
Fox-McCloud 53d15682ce Melee Rebalancing 2014-12-18 10:22:02 -05:00
Markolie 6c92a48c41 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 2014-12-06 01:31:31 +01:00
Markolie aa68b2e160 AI/Cyborg HUD fixes, lets Vox's pick name when spawning, fixes Beepsky's/ED-209's ID'ing issue 2014-12-06 01:26:59 +01:00
Fox-McCloud fd9d3edffb Cell Changes and other Stuff 2014-12-05 05:37:55 -05:00
Fox-McCloud c218c1af3b Production and Mecha Tweaks 2014-12-03 18:20:51 -05:00
Markolie b21575f088 Bot port from /tg/ 2014-12-02 17:59:40 +01:00
Markolie 8f47f50009 Fix stun batons and holographic sign projectors 2014-11-19 20:20:10 +01:00
Markolie 876a5067a0 Adds constructable and upgradeable machinery, fixes the RPED, other minor fixes 2014-11-17 08:32:39 +01:00
Fox-McCloud 111b24ceb8 Janitor Rework 2014-11-10 03:17:56 -05:00
Fox-McCloud dd200af4bf Nuke Ops Rework Phase 2 2014-11-05 06:56:46 -05:00
GinjaNinja32 0427641d89 Moved all shard code to one file. Fixed #5992 
Conflicts:
	code/defines/obj/weapon.dm
	code/game/objects/items/stacks/sheets/glass.dm
 2014-08-16 21:43:38 -04:00
ZomgPonies 99c96c0c9c Let's stay up to date with Zuzu's PR shall we? 2014-07-26 12:04:54 -04:00
Zuhayr ebb9f724aa Hydroponics rewrite, details will be in PR. Big commit. 
Conflicts:
	baystation12.dme
	code/controllers/master_controller.dm
	code/game/gamemodes/events/spacevines.dm
	code/game/machinery/seed_extractor.dm
	code/modules/mob/living/carbon/brain/posibrain.dm
	code/modules/mob/mob.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/reagent_containers/food/snacks/grown.dm
	icons/obj/hydroponics.dmi
	maps/tgstation2.dmm
 2014-07-25 11:10:01 -04:00
Zuhayr 13797e99ed New machines, adjusted Cael's seeds, rewrote space vines. 
Conflicts:
	code/defines/obj/hydro.dm
	code/game/machinery/hydroponics.dm
	code/modules/hydroponics/grown_inedible.dm
	code/modules/hydroponics/hydroitemdefines.dm
 2014-07-25 10:06:19 -04:00
ZomgPonies f2ecd1503b Completed adding Kidan Ambassador decorations 2014-07-23 13:24:51 -04:00
ZomgPonies 653a0bdf37 Added signpost to show NT recruitment office location 2014-07-19 15:19:13 -04:00
PsiOmega cda07c694d Deluxe soap now has a more pleasant range of smells. 2014-07-18 07:05:14 -04:00
mwerezak a07b7a5ce3 Thrown items can be targeted, has miss chance... 
...based on distance, similar to projectiles.

Conflicts:
	code/defines/obj.dm
	code/game/machinery/kitchen/smartfridge.dm
	code/game/machinery/vending.dm
	code/game/mecha/equipment/weapons/weapons.dm
	code/modules/games/cards.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/living_defense.dm
 2014-07-16 09:53:34 -04:00
Rob Nelson 92ac21bbf6 Add "can" to VOX vocab 
Conflicts:
	tools/vox/voxwords.txt
 2014-07-13 16:07:00 -04:00
Menshin bd6b5a6870 Refined the implementation of the AStar algorithm : 
*Reorganised and commented used procs for better visibility/maintenance
*Redid the PriorityQueue class
*Changed the euclidian distance to the byond one (so that we don't calculate float and square root when it's not necessary)
*Made the AStar algorithm use the closed list instead of just filling it
*Some optimization in the open list sorting : last entered is first in case of f ties, slightly less tiles are checked now
*Changes the order directions are checked when adding adjacents turfs to make for more 'realistic' path (read less 'drunk pathing' with lots of diagonals)
*Fixed some turfs densities not being check for diagonal movement
*Closed firedoors are now correctly seens as blocked by the algorithm
*Cleanbots now only moves in cardinal directions, like other bots.
*Updated the info text at the beginning of the file a bit
*Absolutely unrelated : simplified the turf.Bless() proc

Conflicts:
	code/__HELPERS/unsorted.dm
	code/defines/procs/AStar.dm
	code/game/machinery/bots/bots.dm
	code/game/machinery/bots/cleanbot.dm
	code/game/machinery/doors/firedoor.dm
	code/game/machinery/doors/windowdoor.dm
	code/game/turfs/turf.dm
 2014-07-13 15:50:15 -04:00
igalan 7940e3d6db Syntiflesh is defined twice, both as a food/snack and obj/item/weapon. The first one is edible while the second one is not. 
This PR comments out the non-edible one and replaces any reference of it to the edible one.

Conflicts:
	code/defines/obj/weapon.dm
	maps/tgstation2.dmm
 2014-07-13 09:07:36 -04:00
ZomgPonies cb9b6fca4d Replacing civilian with support department. Still need to make changes on MySQL schema. 2014-06-26 19:42:14 -04:00
Chinsky 1d2fb1491f Adds 3 office clutter items. 
Conflicts:
	code/defines/obj/weapon.dm
 2014-06-20 12:11:13 -04:00