cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-04 14:42:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
42,792 Commits 26 Branches 2 Tags
d61fa732f3fac77f7f2cb74db4e4d9f53f16870e
Commit Graph

8924 Commits

Author SHA1 Message Date
variableundefined
5021d5cb27 Merge pull request #10824 from Kyep/slime_emoting 
fixes slime emote runtime
 2019-02-05 10:18:23 +08:00
Kyep
e1fb83f6b6 fixes slime emote runtime 2019-02-04 07:52:26 -08:00
variableundefined
e7d729b074 Merge pull request #10817 from taukausanake/pai_light 
Pai light
 2019-02-03 14:26:46 +08:00
variableundefined
efa598cfd0 Merge pull request #10800 from Fox-McCloud/no-breathe-no-talk 
Lack of Breath Incurs Silence
 2019-02-03 13:25:06 +08:00
taukausanake
f3c44848e2 Applies latest requests 
I _think_ these resolve what was left in the last PR. Been a while since
I last did this

 Changes to be committed:
	modified:   code/modules/mob/living/silicon/pai/software_modules.dm
 2019-02-02 23:16:30 -06:00
taukausanake
b7ce683ab1 Merge branch 'pai_light' of https://github.com/Tayyyyyyy/Paradise into pai_light 
Conflicts:
	code/game/gamemodes/shadowling/shadowling_abilities.dm
	code/game/objects/items/devices/flashlight.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/silicon/robot/robot.dm

 Changes to be committed:
	modified:   code/game/gamemodes/shadowling/shadowling_abilities.dm
	modified:   code/game/machinery/computer/computer.dm
	modified:   code/game/machinery/floodlight.dm
	modified:   code/game/objects/items/devices/flashlight.dm
	modified:   code/game/objects/items/devices/paicard.dm
	modified:   code/modules/clothing/head/hardhat.dm
	modified:   code/modules/clothing/spacesuits/hardsuit.dm
	modified:   code/modules/clothing/spacesuits/plasmamen.dm
	modified:   code/modules/lighting/lighting_atom.dm
	modified:   code/modules/mob/living/carbon/human/human.dm
	modified:   code/modules/mob/living/living.dm
	modified:   code/modules/mob/living/silicon/pai/pai.dm
	modified:   code/modules/mob/living/silicon/pai/software_modules.dm
	modified:   code/modules/mob/living/silicon/robot/robot.dm
	modified:   code/modules/pda/PDA.dm
	modified:   code/modules/power/lighting.dm
	modified:   code/modules/projectiles/gun.dm
 2019-02-02 22:53:46 -06:00
variableundefined
58e3c95c81 Merge pull request #10778 from MINIMAN10000/helpful-push 
Mobs on help intent no longer push structures or mobs that are pulling structures
 2019-02-02 21:05:00 +08:00
Fox McCloud
b02ffcd6a8 Lack of Breath Incurs Silence 2019-02-02 00:15:52 -05:00
variableundefined
d382fa1c7c Merge pull request #10761 from datlo/agentidfixes 
Refactors agent ID phototaking, misc ID fixes/improvements
 2019-02-01 10:17:08 +08:00
Ty-Omaha
913c2061c0 dont_save 2019-01-31 12:10:28 -05:00
datlo
1b08c7a43c Unbreaks wingdings 
Jestosterone PR accidentally removed the check for wingdings mutation.
this re-adds it.
 2019-01-31 14:26:09 +00:00
variableundefined
e19b61662f Merge pull request #10736 from datlo/ghettosurgeryfix 
Refactor surgery early cautery, add cyborg medical grip, misc surgery fix/changes
 2019-01-31 11:29:09 +08:00
variableundefined
dfdd9ce8a0 Merge pull request #9705 from Kyep/ts_move_speed_fix 
Terror spider speed settings now respected when under player control
 2019-01-31 11:26:37 +08:00
variableundefined
21cc9d882f Merge pull request #10680 from Aurorablade/EXTERMINATUSPARTONE 
I JUST CONFLICTED EVERYTHING
 2019-01-31 11:03:33 +08:00
Alffd
110d3b17b4 Revert "Discord Bot Functionality" 2019-01-30 21:19:33 -05:00
Aurorablade
afc6ad524f DMI File Casing Rename 2019-01-30 20:09:39 -05:00
MINIMAN10000
80322feeb5 mobs on helpful intent no longer push pulled structures or players pulling structures, structure.dm follows mob.dm's issilicon for isstructure as per contributing no hacky code, pulledby now set to null when stop_pulling() is called, thus they actually stop pulling 2019-01-29 21:09:53 -08:00
Aurorablade
d3448cf287 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into EXTERMINATUSPARTONE 2019-01-29 17:42:39 -05:00
Kyep
94b76aead9 AOE fix, desc update 2019-01-28 22:51:51 -08:00
variableundefined
5f7eacf4ad Merge pull request #10756 from datlo/abductorbrain 
Changes abductor brains to use the alien brain sprite
 2019-01-29 11:09:33 +08:00
variableundefined
e13a536ddc Merge pull request #10585 from v0idp/discord_bot 
Discord Bot Functionality
 2019-01-29 10:43:51 +08:00
variableundefined
70ddb65f29 Merge pull request #9287 from Citinited/funny-chemicals 
Adds a new clown chemical 🤡
 2019-01-28 06:11:38 +08:00
datlo
33dc194469 ID/Agent ID fixes 
1. Clown and mime get their new name updated properly on their ID after
renaming
2. Added photo outfits to jobs missing it and some syndicate jobs :
Syndicate Officer
Syndicate Agent
Syndicate Nuclear Operative
Clown (no mask in photo)
Mime (no mask in photo)
Coroner
Barber
3. Agent ID description now update with chosen appearance
4. Agent ID photo taking now uses the same proc as a real ID photo, so
they actually look authentic.
The photo is no longer a snapshot of your current mob icon, but instead
forge a photo the same way IDs do, with an outfit matching the job
you've forged on the ID.
5. Agent ID age field when editing now defaults to your real age, as
other fields for it do
 2019-01-27 20:36:51 +00:00
datlo
f6728186c1 Abductors now use the alien (grey) brain sprite 2019-01-27 13:55:43 +00:00
datlo
6271fd8554 nerfs laser scalpels for borgs 
they were too fast and more annoying than helpful, caused you to cauterize too early by accident often
 2019-01-27 13:17:24 +00:00
datlo
e976d6dae8 Medborg get an improved laser scalpel 2019-01-27 12:06:03 +00:00
variableundefined
920395cc7e Merge pull request #10395 from granodd/GunsAndGunAccessories 
New Gun Sounds
 2019-01-27 10:37:03 +08:00
variableundefined
dca84ba581 Merge pull request #10741 from Kyep/hear_say_annoyance 
Fixes hear_say.dm runtime: list index out of bounds
 2019-01-27 10:04:28 +08:00
Kyep
43e2f13226 revert change causing new handling for single-word messages 2019-01-26 17:45:36 -08:00
Kyep
c20919d201 Fixes whispers not being logged properly 2019-01-26 16:44:07 -08:00
Kyep
0872474e34 fixes hear_sleep call too 2019-01-26 15:55:51 -08:00
Kyep
03f4fea43c fixes hear_say.dm,162: list index out of bounds error 2019-01-26 15:41:46 -08:00
variableundefined
4d30623a0d Merge pull request #10727 from datlo/idedplsremovebatswarm 
Remove bat swarm from gold slime spawn pool
 2019-01-27 06:34:20 +08:00
Citinited
eebd8d782f Uses squeak component to do this, fixes broken stuff & Travis 2019-01-26 13:21:03 +00:00
Citinited
4913f343ed Adds jestosterone component 2019-01-26 13:21:02 +00:00
Citinited
d45e33efb5 Removes jestosterone triggering upon alien attack, uses space drugs instead of mercury in its creation 2019-01-26 13:21:02 +00:00
Citinited
3f57d62efb Adds jestosterone 2019-01-26 13:21:02 +00:00
Granodd
6c53564df2 Merge branch 'master' into GunsAndGunAccessories 
# Conflicts:
#	code/modules/projectiles/guns/projectile/automatic.dm
 2019-01-26 02:17:22 -05:00
datlo
9f4e602881 remove extra var, floor surgery, add med gripper 2019-01-26 02:47:38 +00:00
datlo
fdc841be8e whole bunch of surgery changes 
early cautery not compiling yet
 2019-01-26 00:50:18 +00:00
datlo
613999bfc6 Syndicate medborgs now get body analyzer 2019-01-25 20:51:45 +00:00
datlo
20e9968528 Remove batswarm from xenobio spawn pool 2019-01-25 14:17:26 +00:00
variableundefined
75e357cf37 Merge pull request #10670 from iantine/mouse-fluff 
Lumi's fluff mouse and resting mice
 2019-01-23 19:44:46 +08:00
Fox McCloud
ec0f81ed7c Merge pull request #10679 from Terilia/CakeCat 
Cake Cat Cak - How the Chef turned Frankenstein with cake base, sp(r)inkles and frosting
 2019-01-21 22:49:20 -05:00
Nicaragua
8175d67b2e honk_bot from V2 
Originaly from PULL

https://github.com/ParadiseSS13/Paradise/pull/10656
 2019-01-21 12:31:47 -03:00
datlo
c92c222f63 fix greys not getting translator as RD, CMO, CE 2019-01-20 18:14:00 +00:00
Terilia
419acccc99 Updated the cat. If you reference a variable, you need to define it right, woops! 2019-01-20 16:52:36 +00:00
datlo
fffe211c8f readd deathgasping to human/borgs 2019-01-20 12:22:09 +00:00
xerdies
830c519ef8 implemented Fox and Ty's requested changes. 2019-01-20 09:38:21 +00:00
Aurorablade
b812736517 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into EXTERMINATUSPARTONE 2019-01-19 23:35:15 -05:00