cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-30 04:02:33 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,355 Commits 26 Branches 2 Tags
2f401fd7d3600aeebbc71864fbcc42915d2abacc
Commit Graph

297 Commits

Author SHA1 Message Date
Markolie
2677fd587e Bug fixes 2015-01-08 02:16:09 +01:00
Fox-McCloud
a92921786f Clothing Update 2015-01-01 11:23:48 -05:00
Fox-McCloud
8cec4742d0 Defib Unit 2014-12-15 04:55:02 -05:00
DZD
dd631d4806 Migrating Bay pAI Drone Form Port 2014-12-02 18:00:24 -05:00
Markolie
b21575f088 Bot port from /tg/ 2014-12-02 17:59:40 +01:00
Markolie
3be1a2553e Bug fixes, wording changes 2014-11-25 22:56:12 +01:00
Bone White
226ef19345 Removes duplicate entries in floor stat panel 
As title.
 2014-10-30 10:54:58 +00:00
Bone White
1439dd5579 Hardsuit equip time reversion 
At Fox's request
 2014-10-18 01:46:28 +01:00
VampB
ba5744ba9e Fixes UI error 
Fixes the current issue of equiping items in the UI slots
 2014-09-02 16:04:07 +01:00
ZomgPonies
6ebb6d617e Merge pull request #399 from Bone-White/master 
Rigid suit equip delay rework
 2014-08-20 03:07:09 -04:00
Bone White
b5fcd209b2 Rigid suit equip delay rework 
now uses a couple of new procs, allowing for per-suit tweaking of time.
You now cannot equip eva helms without first attaching them to the suit
(target head use helmet on suit)
 2014-08-20 07:28:44 +01:00
PsiOmega
6158805a68 Fixes #5946 and cuts down on duplicate code across Life() procs. 
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/silicon/ai/life.dm
	code/modules/mob/mob.dm
 2014-08-16 21:18:18 -04:00
ZomgPonies
b06eb66ca4 Fix for bloody hands yanking shit 2014-08-16 20:58:37 -04:00
ZomgPonies
65af681dad Merge pull request #370 from Regory/tajaran-spawn-gloves 
Better Racial Item Spawns
 2014-08-11 20:37:02 -04:00
Regory
f8ed5bf6b6 Sync Changes from Paradise Master 
Sync changes
 2014-08-09 18:48:19 -04:00
Regory
7ac1d76f80 Fixes equip_or_collect 
Equip_or_collect fixed to not delete the item being equipped.

Equip or Collect would use equip_or_del, and if failed, would try to
insert the item in a bag.  However, equip_or_del deletes the item, so it
cannot be put in the bag afterwards.
 2014-08-09 17:53:18 -04:00
alex-gh
bbc9e51679 is_in_brig() fixes 2014-08-06 23:42:54 +02:00
Jeremy Liberman
a4196cb745 Add Vox Heist directive and call shuttle on completion of Directive X 
Conflicts:
	baystation12.dme
	code/controllers/emergency_shuttle_controller.dm
	code/modules/mob/mob.dm
 2014-08-06 23:12:24 +02:00
Loganbacca
5faef31f60 Train fixes and balancing 
- Slows trains to 90% of running speed
- Changes train impact damage to only take into account speed, not train length (otherwise you could insta kill people with a long enough train)
- Fixes a bug with towed cars ghosting through closed airlocks
- Stuns mobs who fall off a train that has blown up
- Fixes mobs standing/lying on vehicles
- Fixes exploding trains not decoupling correctly

Conflicts:
	code/modules/mob/mob.dm
	code/modules/vehicles/cargo_train.dm
	code/modules/vehicles/train.dm
 2014-08-03 15:13:52 -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
PsiOmega
df59d8cbc7 Makes it possible for the AI to alt+left click turfs in camera view and grants ctrl/alt shortcuts to the turret control. 
AI can now alt+left click turfs in camera view to list and interact with objects in the status tab. For example allows for interacting with emergency shutters beneath grills.
alt-clicking doors now notifies the AI when they are electrified/un-electrified as, unlike most other shortcuts, this doesn't have a visual cue.
When interacting with doors and the AI-control is disabled hacking is now automatically initiated, as if the AI had attempted to open the door 'menu'.
When borgs/AIs try to interact with an emagged door they now receive a feedback message that it's unresponsive.

Parts of implementation done by porting code from tg-station.

Conflicts:
	code/_onclick/ai.dm
	code/_onclick/click.dm
	code/modules/mob/living/silicon/ai/freelook/cameranet.dm
	code/modules/mob/mob.dm
 2014-07-23 14:55:03 -04:00
ZomgPonies
431ab486b3 Made all current wizard + genetic spells a subtype of spell/wizard (Since they use the same action button row) 2014-07-23 11:04:07 -04:00
ZomgPonies
88098da3c7 Object verb removal crew 2014-07-15 08:47:43 -04:00
ZomgPonies
b0edf2cc0b Small fix 2014-07-13 09:01:47 -04:00
Hubblenaut
aed68c1c2c Fixes canmove updating wrongly on movable chairs 
Conflicts:
	code/modules/mob/mob.dm
 2014-07-13 07:27:47 -04:00
ZomgPonies
2bb72d378b Movement fix 2014-07-13 07:06:11 -04:00
Hubblenaut
6c0122e7d6 Fixes in wheelchair and different handling of movement 
Conflicts:
	code/game/objects/structures/stool_bed_chair_nest/bed.dm
	code/modules/mob/mob.dm
 2014-07-13 06:52:38 -04:00
ZomgPonies
0f94b0d415 Wont be deaf if you die unconscious/knocked out. 2014-06-21 16:45:32 -04:00
Loganbacca
a72d2824dc New vehicle loading code 
Conflicts:
	code/modules/mob/mob.dm
	code/modules/mob/mob_movement.dm
 2014-06-20 09:01:00 -04:00
ZomgPonies
cd3a972331 Runtime fix due to Vox nitro tanks 2014-06-16 22:56:30 -04:00
ZomgPonies
ed36dbd6d9 2 new karma jobs -- Brig Physician and Magistrate 2014-06-15 23:40:47 -04:00
Jeremy Liberman
33cd27e032 Prevents mindless candidates for mutiny mode, adds loyalists/mutineers to AntagHUD, allows admins to reassign heads, and adds remaining Directive X objectives to Check Antagonists panel. 
Conflicts:
	code/__HELPERS/names.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/mob.dm
	code/modules/mob/new_player/new_player.dm
 2014-06-05 16:05:09 -04:00
Jeremy Liberman
b3d3f5df8c Mutiny fix prereqs for directives 
Conflicts:
	code/game/gamemodes/mutiny/directives/alien_fraud_directive.dm
	code/game/gamemodes/mutiny/directives/bluespace_contagion_directive.dm
	code/game/gamemodes/mutiny/directives/financial_crisis_directive.dm
	code/game/gamemodes/mutiny/directives/ipc_virus_directive.dm
	code/game/gamemodes/mutiny/directives/research_to_ripleys_directive.dm
	code/game/gamemodes/mutiny/directives/tau_ceti_needs_women_directive.dm
	code/game/gamemodes/mutiny/directives/terminations_directive.dm
	code/game/gamemodes/mutiny/directives/test_directive.dm
	code/modules/mob/mob.dm
	code/modules/mob/new_player/new_player.dm
 2014-05-25 22:34:39 +02:00
ZomgPonies
69725d9466 Revert "Refactored, simplified access system a bit. Tested, for once." 
This reverts commit a5e65d9b2b.
 2014-05-20 20:58:23 -04:00
Rob Nelson
369b99530a Refactored, simplified access system a bit. Tested, for once. 
* Mobs provide GetAccess() and hasFullAccess()
 * Human GetAccess() provides the "best" accesses available combined from all conventional sources.\
 * Silicons have hasFullAccess()
 * AdminGhosts also provide full access.

Conflicts:
	code/game/jobs/access.dm
	code/modules/mob/dead/observer/observer.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/silicon/silicon.dm
	code/modules/mob/mob.dm
	html/changelog.html
 2014-05-20 15:51:22 -04:00
jack-fractal
05da6ed973 adding modifications to cult mode, working spirits, and mask transformation procs 
Conflicts:
	code/game/gamemodes/cult/runes.dm
	code/modules/mob/mob.dm
	code/modules/mob/mob_movement.dm
 2014-05-15 05:16:13 -04:00
Jeremy Liberman
bd249e3a53 Mutiny Mode 
Conflicts:
	code/__HELPERS/time.dm
	code/controllers/hooks-defs.dm
	code/controllers/hooks.dm
	code/game/machinery/computer/card.dm
	code/game/machinery/podmen.dm
	code/modules/admin/player_panel.dm
	code/modules/client/preferences.dm
	code/modules/mob/living/carbon/brain/brain_item.dm
	code/modules/mob/living/carbon/human/death.dm
	code/modules/mob/living/login.dm
	code/modules/mob/mob.dm
	code/modules/security levels/keycard authentication.dm
	code/setup.dm
	icons/mob/mob.dmi
 2014-05-15 01:01:54 -04:00
Rob Nelson
9d53cfa446 Moved Vox DMI to a subfolder, added species-based random-naming, fixed preview. 
Tested.

Conflicts:
	code/game/gamemodes/vampire/vampire_powers.dm
	code/game/gamemodes/vox/heist/heist.dm
	code/modules/admin/verbs/one_click_antag.dm
	code/modules/events/heist.dm
	code/modules/mob/living/carbon/species.dm
	code/modules/mob/mob.dm
	code/modules/mob/new_player/new_player.dm
	code/modules/mob/new_player/preferences_setup.dm
 2014-05-14 04:32:18 -04:00
ZomgPonies
582f3c4edc Fix being unable to respawn as mouse 2014-05-14 02:56:10 -04:00
ZomgPonies
e8ae55cead Wow, I must've been tired on that one. Fixes respawn as NPC. 2014-05-14 02:50:51 -04:00
ZomgPonies
d5502ca62e Should fix dead embryos being spawnable maybe? 2014-05-08 02:43:37 -04:00
ESwordTheCat
a947775f2e Add missing lens. 
Conflicts:
	code/modules/mob/mob.dm
 2014-04-19 19:13:05 -04:00
MrPerson
5bb608e56e Redo of jitteriness and dizziness. 
Fixes #2923

Conflicts:
	code/game/gamemodes/changeling/changeling_powers.dm
	code/game/mecha/equipment/weapons/weapons.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/mob.dm
	code/modules/mob/mob_defines.dm
	code/modules/reagents/Chemistry-Reagents.dm
 2014-02-28 22:21:33 -05:00
ZomgPonies
1ab8df4b13 Garbage collection fixes 2014-02-19 20:24:31 -05:00
Segrain
dd1f5f1546 Fix for unpinning humans. 2014-02-14 12:07:30 +01:00
Segrain
3b86b29063 Check for verb removal. 2014-02-10 07:01:30 -05:00
Zuhayr
6302573ed3 Fixes #4223 
Conflicts:
	code/modules/mob/living/carbon/human/human_damage.dm
	code/modules/mob/living/carbon/human/human_defense.dm
 2014-02-10 07:00:58 -05:00
Zuhayr
56e71df462 Generalized yank_out_object(). 2014-02-10 06:53:25 -05:00
Rob Nelson
c86063c271 Fix genetics spells not working. GG for not using panel variable, nerds. 2014-02-06 23:52:20 -05:00
ZomgPonies
74c3c6e83b compile fix 2014-02-04 03:09:04 -05:00