cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-02 05:32:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,253 Commits 26 Branches 2 Tags
ccbe2ca904ed239a01f753a9fda3bb4f3527d2ef
Commit Graph

12841 Commits

Author SHA1 Message Date
Tastyfish
ccbe2ca904 Makes cans crushable by humans and janiborgs 2016-04-10 17:20:09 -04:00
Fox McCloud
922855385c Merge pull request #4143 from Tastyfish/syndi4life 
Makes synipets and borgi not need to breathe air
 2016-04-09 18:24:27 -04:00
Tastyfish
20f8ca1095 Fixes meals prepared / food eaten scoreboard stats 2016-04-09 02:28:53 -04:00
Fox McCloud
ea9489db70 Merge pull request #4115 from tigercat2000/alt_appearances_remmie 
Alternate Appearance system
 2016-04-08 21:18:25 -04:00
Fox McCloud
9f4058a43e Merge pull request #4142 from Tastyfish/dsodfijas 
Fixes cyborg pda messenger
 2016-04-08 20:13:33 -04:00
Tastyfish
5aae9c30af Makes synipets and borgi not need to breathe, all cats eat mice (except syndicat) 2016-04-08 16:18:52 -04:00
Tastyfish
b00a8bf95a Fixes cyborg pdas 2016-04-08 15:00:52 -04:00
Fox McCloud
1e780bfcb5 Merge pull request #4131 from Aurorablade/DAMNMONKEYS 
Playing with Monkey Meat
 2016-04-07 22:31:39 -04:00
Aurorablade
7137af5fce forgot this 2016-04-07 22:20:50 -04:00
Aurorablade
7cf0f7627a Playing with Monkey Meat 2016-04-07 22:14:43 -04:00
TheDZD
8ad5e18757 Merge pull request #4112 from Fox-McCloud/xenobio-overhaul 
Xenobio Refactor/Changes
 2016-04-07 17:54:33 -04:00
TheDZD
be9087cca9 Merge pull request #4113 from Fox-McCloud/statues-fixing 
TG Statue Fixes/Refactor
 2016-04-07 17:54:17 -04:00
TheDZD
8481dbb961 Merge pull request #4125 from Tastyfish/bloodfix 
Fixes pulling person blood
 2016-04-07 17:47:36 -04:00
Tastyfish
81d91df5ce Makes fingerless gloves functionally clipped 2016-04-07 17:02:17 -04:00
Tastyfish
29f9507052 Fixes pulling blood 2016-04-07 16:35:53 -04:00
Tigercat2000
801cbe7f8d Alternate Appearance system (from tgstation/-tg-station#16586) 
This adds an "alternate appearance system" using image overrides and a new
handler system.

Usage:
 - Create a new `image()` casted as `var/image`
 - Set image.override = 1
 - Call mob.add_alt_appearance("appearance_ID", image, listOfMobsToDisplayTo).
 - To remove an image, you use mob.remove_alt_appearance("appearance_ID")

Comes with one usage, cardborg costumes. They will now disguise you as a
standard borg to any silicon mobs and yourself.
As this is a per-client system, that means that only silicon mobs and you will
see yourself as a standard borg. All other mobs will see you as a silly
human in a cardborg costume.
 2016-04-06 13:58:03 -07:00
Fox-McCloud
64cd6a0cdc TG Statue Fixes/Refactor 2016-04-06 02:20:24 -04:00
Fox-McCloud
3f7f6704c8 Xenobio Refactor/Changes 2016-04-06 01:37:04 -04:00
Fox McCloud
a669d0fac4 Merge pull request #4107 from tigercat2000/to_chat 
Replace most (if not all) output << operators with to_chat(user, message)
 2016-04-06 00:39:02 -04:00
Fox McCloud
337ddd1896 Merge pull request #4111 from Tastyfish/straightjackets-derp 
[s]Fixes restrained issue with slot clicking thing
 2016-04-06 00:30:26 -04:00
Tigercat2000
797740da7d Fix all of the merge conflicts and lacking to_chats with 4041 2016-04-05 21:16:52 -07:00
Tigercat2000
dd79aaa967 Merge remote-tracking branch 'upstream/master' into to_chat 
Conflicts:
	code/game/machinery/door_control.dm
 2016-04-05 21:10:36 -07:00
Tastyfish
f86cb2b049 Fixes straightjacket issue with slot clicking thing 2016-04-05 23:24:24 -04:00
FalseIncarnate
8a558a7c96 Merge Conflict 2016-04-05 19:26:30 -04:00
Tigercat2000
bb5e3bca63 Fix remaining issues and sound shit 2016-04-05 16:26:11 -07:00
FalseIncarnate
40ee9bb99d Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into logic 2016-04-05 19:15:11 -04:00
Tigercat2000
c72cc9606e Merge remote-tracking branch 'upstream/master' into to_chat 
Conflicts:
	code/modules/research/xenobiology/xenobiology.dm
 2016-04-05 15:54:48 -07:00
TheDZD
35f89251b3 Merge pull request #4100 from Fox-McCloud/sentience-potion-changes 
Sentience Potion Changes
 2016-04-05 18:37:57 -04:00
TheDZD
2546c290f4 Merge pull request #4095 from Fox-McCloud/mob-spawn-refactor 
Simple Animal Spawn Refactor
 2016-04-05 18:34:34 -04:00
Fox McCloud
59c0d41695 Merge pull request #4097 from Tastyfish/botsgoddamn 
Tweaks/fixes some bot radio/language stuff, lazarus capsules
 2016-04-05 17:53:00 -04:00
Tigercat2000
78f53553f8 Reduce lines by removing blank lines added by PJ's script 2016-04-05 08:25:57 -07:00
Tigercat2000
9d430844c3 Replace most (if not all) output << operators with to_chat(user, message) 
Currently, to_chat is literally just a proc that does user << message.
But it'll let us do output modification in the future, especially for
something like Goon's HTML chat.

Big thanks to PJB for his to_chat script, see
https://github.com/d3athrow/vgstation13/pull/6625 for more details.
 2016-04-05 08:15:05 -07:00
Fox McCloud
a361364a94 Merge pull request #4088 from tigercat2000/offhands 
Add inactive hand to carbon get_access
 2016-04-04 17:19:09 -04:00
Fox-McCloud
fe5f803476 forgot these two 2016-04-04 17:04:43 -04:00
Fox-McCloud
b7afdec18c defines 2016-04-04 17:01:03 -04:00
TheDZD
3bcbccdad6 Merge pull request #4082 from Fox-McCloud/weak-eyes 
Fixes Weakeyes
 2016-04-04 15:12:05 -04:00
Fox McCloud
71c30b879d Merge pull request #4083 from Aurorablade/MeteorOps2 
MeteorOps Tweaks
 2016-04-04 07:14:09 -04:00
Fox-McCloud
aee239c6e5 Sentience Potion Changes 2016-04-04 04:45:13 -04:00
Tastyfish
16c8e24f04 Tweaks/fixes some bot radio/language stuff, lazarus capsules 2016-04-04 02:02:19 -04:00
Fox-McCloud
3bd37ec757 Simple Animal Spawn Refactor 2016-04-04 00:30:10 -04:00
Crazylemon64
26a9f441ea MULEbots will now announce their deliveries to request consoles again 2016-04-03 17:02:40 -07:00
Fox McCloud
9e74cbcc1b Merge pull request #4090 from Tastyfish/bots23 
Fixes mulebots killing passenger, bot tweaks
 2016-04-03 17:48:39 -04:00
Tastyfish
b2d9c2e6a9 Fixes mulebots killing passenger, bot tweaks 2016-04-03 15:39:54 -04:00
Tigercat2000
e2442e7fc9 Add inactive hand to carbon get_access 2016-04-03 12:33:52 -07:00
Aurorablade
eb4ddb247d MeteorOps Tweaks 2016-04-03 01:54:51 -04:00
Fox McCloud
a30b5fbf75 Merge pull request #4076 from Aurorablade/ICUTYOU 
Fixes IPC Embbedded object surgery
 2016-04-03 01:24:28 -04:00
Fox-McCloud
b3b0abd95b Fixes Weakeyes 2016-04-03 01:19:49 -04:00
Tigercat2000
94ff8fc4ef whoops forgot to remove this 2016-04-02 21:32:11 -07:00
Aurorablade
e045e10268 remoing pasted line 
i need to remove the rest of em later.
 2016-04-02 23:42:14 -04:00
Aurorablade
279937c58b Fixes IPC Embbedded object surgery 2016-04-02 23:34:38 -04:00