Commit Graph

11450 Commits

Author SHA1 Message Date
TheDZD
66c5b2cd9a Merge pull request #4321 from Fox-McCloud/cig-fix
Cig Icon FIx
2016-04-29 19:48:26 -04:00
TheDZD
411dbdcf40 Merge pull request #4246 from FlattestGuitar/lightbulbs
Lightbulbs no longer burn you, lighters do a bit less.
2016-04-29 19:44:01 -04:00
Fox-McCloud
e3513cd4e6 Cig Icon FIx 2016-04-29 06:37:57 -04:00
Fox McCloud
7adaa11a46 Merge pull request #4317 from Tastyfish/check-antags
Fixes Check Antagonists Panel
2016-04-28 22:34:55 -04:00
Tastyfish
5268804db0 Fixes Check Antagonists Panel 2016-04-28 22:23:42 -04:00
Fox McCloud
ad16e065af Merge pull request #4314 from Crazylemon64/autosay_fix
Fixes autosay to no longer create AIs for their messages
2016-04-28 20:23:37 -04:00
Fox McCloud
8892def83c Merge pull request #4289 from pinatacolada/pman
Plasma security now spawn with their gun in the bag
2016-04-28 18:39:41 -04:00
Crazylemon64
501fa17958 Fixes autosay to no longer create AIs for their messages 2016-04-28 14:53:52 -07:00
Fox McCloud
110958860b Merge pull request #4270 from FlattestGuitar/foamforce
Ports /tg/ FOAM FORCE
2016-04-27 11:43:55 -04:00
TheDZD
ddc459d92a Merge pull request #4189 from Fox-McCloud/xenobio-additions
Xenobio Addition
2016-04-26 20:23:49 -04:00
TheDZD
3825cd51de Merge pull request #4291 from Fox-McCloud/camera-alt-fix
Abductor Camera Alt Fix
2016-04-26 19:33:32 -04:00
TheDZD
c0ccc56969 Merge pull request #4288 from Fox-McCloud/door-wands
Ports Door Wands
2016-04-26 19:31:41 -04:00
Fox-McCloud
a275496723 my code immersions 2016-04-26 19:25:40 -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
23174def7a Merge pull request #4283 from Tastyfish/checkout-my-moves
Makes admin jump commands use forceMove(), improves forceMove
2016-04-26 19:13:09 -04:00
Fox McCloud
283acc01d3 Merge pull request #4258 from pinatacolada/fridges
Makes fridge boards be selectable
2016-04-26 18:54:17 -04:00
Tastyfish
a9582d9247 Improves admin jump commands, forceMove 2016-04-26 18:53:17 -04:00
Fox-McCloud
d03a7ba7b5 fixes and defines 2016-04-26 00:51:24 -04:00
Fox-McCloud
52b810a8ba Abductor Camera Alt Fix 2016-04-25 22:35:51 -04:00
TheDZD
18a63c788d Merge pull request #4267 from tigercat2000/CRAZY_HUDS_AMIRITE
-tg- HUD styles
2016-04-25 19:57:59 -04:00
Tigercat2000
d01eb6504e Fixes 2016-04-25 16:53:40 -07: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
pinatacolada
ee40390ffe Plasma security now spawn with their gun in the bag
Fixes #4071

Warden, officers, and pod pilot spawn with the taser in their bag.
Head of Security spawns with egun in the bag.
Brig physician spawns with pen light in their bag.
Also made other species pod pilots spawn with the taser in their bomber
jacket, since it now can hold it, and is more consistent with the rest
of the officers

🆑 pinatacolada
fix: Plasmamen security now spawn with their suit slot items in their
bags
tweak: Pod pilots spawn with taser in the suit slot
/🆑
2016-04-25 17:47:46 +01:00
Fox-McCloud
c587019b87 Ports Door Wands 2016-04-25 06:06:20 -04:00
Mieszko Jędrzejczak
0f7be5576f Gunshot sounds, uplink references, less spammy tommygun, fixes 2016-04-25 11:32:48 +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
Tastyfish
f51057b997 Fixes beach drop turf smoothing 2016-04-24 22:53:48 -04:00
pinatacolada
ccf51de2ca fixes #4259 2016-04-24 22:17:28 +01:00
pinatacolada
af04360af1 SKREEEE 2016-04-24 20:10:31 +01:00
Tigercat2000
57648bd6b7 Fix multiple instances of to_chat not being used 2016-04-23 20:45:37 -07:00
Fox McCloud
e7bb8c22cc Merge pull request #4220 from CrAzYPiLoT-SS13/chess_ma_dudes
Adds SpessChess!
2016-04-23 21:05:53 -04: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
TheDZD
7990a25cf0 Merge pull request #4255 from Fox-McCloud/how-revolutionary
Updates Revolution
2016-04-22 23:57:03 -04:00
Aurorablade
ac31143cb9 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into Kungfu 2016-04-22 23:29:06 -04:00
Fox McCloud
e6666a8c4c Merge pull request #4266 from monster860/fixgriff
Fix ERT teleport exploit with abductor
2016-04-22 23:10:32 -04:00
Aurorablade
cb38f7b0f9 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into Kungfu 2016-04-22 21:45:18 -04:00
Mieszko Jędrzejczak
5cf3f25892 Ports /tg/ Foam Force guns 2016-04-22 23:35:55 +02:00
Aurorablade
ec263dbfca mimejutsu 2016-04-22 16:07:56 -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
Fox McCloud
ff27b4f77a Merge pull request #4263 from Tastyfish/smooth-shuttles
Fixes shuttle smoothing
2016-04-21 22:58:49 -04:00
monster860
55af378cfe Fix griff 2016-04-21 22:22:02 -04:00
Fox-McCloud
ab16128e7c Updates Mining Loot Crates 2016-04-21 21:37:13 -04:00
Tastyfish
198656874d Fixes shuttle smoothing 2016-04-21 21:35:53 -04:00
Fox McCloud
7594206d16 Merge pull request #4261 from Tastyfish/vampfix
Fixes devamping via the traitor panel
2016-04-21 20:15:19 -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
Tastyfish
b798e7ef18 Fixes devamping in traitor panel 2016-04-21 19:58:49 -04:00