cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-11 01:51:51 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,593 Commits 26 Branches 2 Tags
dbc65dc7ec4fc7a084232f652dfe309fcbd5153b
Commit Graph

6430 Commits

Author SHA1 Message Date
Aurorablade
dbc65dc7ec tweaks on feedback 2016-04-30 16:04:56 -04:00
Aurorablade
7e405427aa changess 2016-04-29 02:09:05 -04:00
Aurorablade
7a99d8fe74 Crazy Fethas Traitor Emporium of Horrors 2016-04-27 19:09:21 -04:00
Tastyfish
f8ebf7d672 Fixes reviving while restrained 2016-04-27 04:22:47 -04:00
Fox McCloud
c07b0130f1 Merge pull request #4297 from FlattestGuitar/examine 
Fixes Unathi examine message.
 2016-04-26 19:34:52 -04:00
TheDZD
8488c976e8 Merge pull request #4262 from KasparoVy/IPC-EXTRA-STUFF-REFACTOR 
Refactor FBP Parts & Adds Prosthetic Brand Models & More Antennae & Continued....
 2016-04-26 19:15:19 -04:00
TheDZD
ebb124dfc9 Merge pull request #4282 from QuinnAggeler/IPCfix 
Fixes braindead IPC death message spam
 2016-04-26 19:14:10 -04:00
Mieszko Jędrzejczak
73affd479e GODDAMN LIGGERS 2016-04-26 21:55:14 +02:00
Fox-McCloud
a4dce5dd5f Nutrition Fix 2016-04-25 23:30:55 -04:00
TheDZD
18a63c788d Merge pull request #4267 from tigercat2000/CRAZY_HUDS_AMIRITE 
-tg- HUD styles
 2016-04-25 19:57:59 -04:00
TheDZD
98a94a37d5 Merge pull request #4273 from FlattestGuitar/examine 
Makes a human's species visible on examine.
 2016-04-25 18:37:17 -04:00
TheDZD
f65910c3d9 Merge pull request #4274 from tigercat2000/attackpref 
#4243 preference option
 2016-04-25 18:34:48 -04:00
TheDZD
cdc20258a1 Merge pull request #4212 from Tastyfish/bans 
Cleans up special role jobbans
 2016-04-25 18:34:37 -04:00
TheDZD
6e71809d5e Merge pull request #4272 from Fox-McCloud/injections 
Fixes Several Injections
 2016-04-25 17:17:58 -04:00
Mieszko Jędrzejczak
399fe7cdc2 slime people whoopsie 2016-04-25 12:50:45 +02:00
Fox McCloud
ff2da1c159 Merge pull request #4238 from Aurorablade/Kungfu 
Fethas Carnival of Horrors:crouching tarajan,hidden unathi
 2016-04-25 04:35:35 -04:00
HugoLuman
f16dc32686 Fixes IPC deathgasp spam 
Adds a brain damage threshold to the can_revive_by_healing proc to prevent braindead IPCs from continually dying and reviving.

Signed-off-by: HugoLuman <qaggeler@uci.edu>
 2016-04-24 16:00:28 -07:00
Tigercat2000
57648bd6b7 Fix multiple instances of to_chat not being used 2016-04-23 20:45:37 -07:00
Tigercat2000
d08cb0db9c Adds a preference setting to the "ghost item attack" thing 2016-04-23 17:31:52 -07:00
TheDZD
5be973de20 Merge pull request #4243 from Fox-McCloud/attack-animations 
Ports TG's Improved Attack Animations
 2016-04-23 20:30:38 -04:00
Mieszko Jędrzejczak
038ca241c6 Fixes the fixes 2016-04-23 20:26:54 +02:00
TheDZD
e09f708f2c Merge pull request #4254 from Meisaka/enoughwiththesss 
Make silicon/AI/robot/drone/pAI emotes sane again.
 2016-04-23 10:20:39 -04:00
Mieszko Jędrzejczak
3151b7f3bd A human's species will now be visible on examine. 2016-04-23 12:21:14 +02:00
Fox-McCloud
e9010971bf Fixes Several Injections 2016-04-23 03:45:29 -04:00
TheDZD
f69ff5f30a Merge pull request #4264 from Fox-McCloud/mining-crate 
Updates Mining Loot Crates
 2016-04-22 23:57:32 -04:00
Fox-McCloud
6da5d4f1fc re-add things 2016-04-22 22:36:03 -04:00
Aurorablade
cb38f7b0f9 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into Kungfu 2016-04-22 21:45:18 -04:00
Aurorablade
ec263dbfca mimejutsu 2016-04-22 16:07:56 -04:00
Tastyfish
848b486020 Fixes reloading gun for player-controlled hostiles 2016-04-22 15:59:20 -04:00
Tigercat2000
66416ae5ec Merge remote-tracking branch 'upstream/master' into CRAZY_HUDS_AMIRITE 
Conflicts:
	code/game/gamemodes/vampire/hud.dm
 2016-04-21 20:31:58 -07:00
Tigercat2000
0f70e6810b -tg- OOP Hud Refactor 
- Added 4 new HUD styles
 - Humans recreate their hud if they change their UI pref mid-game
 - Refactored how objects are added to the client screen
 - HUD's are now handled by subtype and mob/proc/create_mob_hud()
 - HUD visibility is no longer chained directly to the F12 button, it's a proc on HUD datums now
 - Mobs only create/destroy their HUD when necessary, not every Login()
 - Destroyed aim-mode, it didn't work and I couldn't make it work.
 - Renamed all of the screen1_x.dmi files to screen_x.dmi
 - Removed screen1.dmi, screen_gen.dmi now handles generic icons.
 2016-04-21 20:28:08 -07:00
KasparoVy
18520dc1e0 Fixes Headlight Sprite and Fixes Hair+Head Accessory Animation 
Hair and Head Accessories will now no longer animate as fast as they
possibly can and, instead, will follow the timings the spriter defined
in the .dmi file.
 2016-04-21 23:00:11 -04:00
Fox-McCloud
ab16128e7c Updates Mining Loot Crates 2016-04-21 21:37:13 -04:00
TheDZD
db2860aa86 Merge pull request #4253 from Meisaka/fixthelights 
Fix the light toggles on drones and guardians.
 2016-04-21 20:11:37 -04:00
KasparoVy
3b435c023a Refactor scissors, fix and finalize prefs, fix missing part definition for xion models, etc. 
continued: Monitor changing verb will now only show a list of monitor
styles available for the monitor head brand you are using.

For example, if you chose any of the regular monitor heads (default
morpheus or anything suffixed with mtr.) you will get a list of IPC
standard monitor styles and nothing else.
However, if you chose the hesphiastos alt head (which is also a monitor,
but of a different style) the list will be populated with the monitor
styles suitable for that hesphiastos head, but none others (not even the
ipc standard ones, since those don't fit and hesphiastos alt. isn't in
the models_allowed list)
 2016-04-21 19:59:09 -04:00
KasparoVy
6398e9c3fe Pass2 2016-04-21 19:58:38 -04:00
KasparoVy
a9ee7ea97e PASS 1 
TO DO: SCISSORS AND SHAVER REWORK
 2016-04-21 19:58:37 -04:00
Meisaka Yukara
8cf5534a3d Make robot/silicon/pAI emotes sane again. 2016-04-21 15:35:01 +09:00
Meisaka Yukara
e4b2f8d870 Fix the light toggles on drones and guardians. 2016-04-21 11:23:08 +09:00
Fox-McCloud
552b02050a Merge remote-tracking branch 'upstream/master' into fixes-cold-heat 2016-04-20 18:06:03 -04:00
TheDZD
3dd4f16008 Merge pull request #4233 from Fox-McCloud/abduction 
Abduction
 2016-04-20 11:01:55 -04:00
Fox-McCloud
685e5c28ea Ports TG's Improved Attack Animations 2016-04-20 05:50:09 -04:00
TheDZD
5df0a9afe4 Merge pull request #4221 from tigercat2000/tgalerts 
-tg- screen alerts
 2016-04-19 19:13:31 -04:00
Fox-McCloud
0fa40f4650 tweaks 2016-04-18 06:45:26 -04:00
Fox-McCloud
87a9f30bd4 Part 6 2016-04-18 05:32:41 -04:00
TheDZD
08708c7a17 Merge pull request #4226 from Tastyfish/wpai 
Lets pAI's whisper consistently
 2016-04-17 19:55:33 -04:00
Fox-McCloud
fe170db7bb part 3 2016-04-17 10:35:10 -04:00
Fox-McCloud
2453735d3f part 2 2016-04-17 00:21:31 -04:00
Aurorablade
2d85f582e1 martial arts shit 2016-04-16 22:22:21 -04:00
Tastyfish
4151991e65 Lets pAI's whisper 2016-04-16 20:15:32 -04:00