cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-05 07:02:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
24,898 Commits 26 Branches 2 Tags
2fc7a199a86fac505ba972768650c98ebb35fa89
Commit Graph

578 Commits

Author SHA1 Message Date
Fox McCloud
3d04e396ed Merge pull request #2825 from Tastyfish/coughsplosion 
Added voice analyzer & Entertainment monitor supporting audible emotes
 2015-12-14 20:47:33 -05:00
Tastyfish
21d04ecfbf removed radio hear_message per fox's request 2015-12-13 20:49:16 -05:00
Tastyfish
d1fa228b19 Fixed hologram hearing, megahones, intercoms&tape recorders picking up emotes in room 2015-12-13 18:29:27 -05:00
Tastyfish
f39649be57 added hear_message, like hear_talk but for audible emotes, voice analyzer & newscaster support 2015-12-13 04:36:41 -05:00
Fox-McCloud
a2d10c4c49 Cell Weight Class and Tech Fixup 2015-12-12 22:40:02 -05:00
Crazylemon64
289d54661c Roboconsole gives loc and health, Drones now flash right 
- Adds health and location readings to the robot control console

- Drones now update status effects, so that flashes don't last forever
 2015-12-08 14:29:56 -08:00
Tastyfish
b2abdd34c1 added input cancelling to pda msg, chemmaster ops, borg mod selection 2015-11-30 01:06:21 -05:00
ZomgPonies
3cb7ec5e08 Bunch of robutt stuff 2015-11-25 22:41:09 -05:00
Tastyfish
85d651b781 refactored datum/effect/system because it was a complete mess 2015-11-22 19:43:01 -05:00
TheDZD
740e5304fd Merge pull request #2613 from ZomgPonies/nations2 
Nations 2.1
 2015-11-21 22:20:39 -05:00
Tastyfish
83f8ba9b72 Gave atmos techs access to :e on station bounced radios 2015-11-21 16:04:19 -05:00
ZomgPonies
66202ff4b6 Bugfixes 2015-11-21 10:46:16 -05:00
Tigercat2000
d2ea2ae2e1 Fix pAI interface (somewhat) 2015-11-20 21:23:31 -08:00
ZomgPonies
bd0dd2ab4b Added Peacekeeper borgs, removing thermals, giving them blue eyes, etc 2015-11-20 19:21:39 -05:00
ZomgPonies
589239f3cd Make combat borg shield only need inv to be active 2015-11-20 19:04:49 -05:00
ZomgPonies
b8b7075780 Typo 2015-11-20 18:38:06 -05:00
ZomgPonies
d3db1a7fe9 Combat borg shields block flashes when active 2015-11-20 18:36:04 -05:00
Tigercat2000
1023727689 Fix UI issues, fix weird modkit list 2015-11-11 17:55:36 -08:00
Tigercat2000
633a9e68b4 Merge remote-tracking branch 'upstream/master' into third_times_the_charm_questionmark 
Conflicts:
	code/modules/mob/living/carbon/human/human.dm
	 ^ This shit is haunted. It's conflicted on two branches for 0
	 reason, the automatic merge wouldn't work on the fucking end of
	 file.
 2015-10-19 16:13:51 -07:00
Fox McCloud
b7e4dab0e3 Merge pull request #2369 from tigercat2000/hmm_fancy 
Radio NanoUI improvements
 2015-10-16 17:19:22 -04:00
Fox McCloud
0db1f97c14 Merge pull request #2349 from tigercat2000/pda_nano 
PDA CSS, to make it look like the old PDAs.
 2015-10-14 17:34:31 -04:00
Tigercat2000
18f01ba2b3 Radio NanoUI improvements 
This commit does the following:
 - Adds radio coloring to the channel names, ex, security is red, service
   is green.
 - Removes the broken "Speaker:" part of headsets, if the purpose of
   on-off buttons is not clear enough, they shouldn't be using radios in
   the first place!
 2015-10-14 08:35:24 -07:00
Tigercat2000
9398a3a92c Retro Toggle, more color tweaks 2015-10-12 13:38:22 -07:00
TheDZD
cbe21922ef Merge pull request #2346 from Fox-McCloud/suspicious-dereferencing 
More Dereferencing
 2015-10-12 16:36:14 -04:00
Fox McCloud
03e233f629 Merge pull request #2342 from Robertha89/master 
Fixes reagent scanner not showing time of death correctly
 2015-10-12 13:49:06 -04:00
Fox-McCloud
81cfcd7af3 More Dereferencing 2015-10-12 02:37:52 -04:00
Tigercat2000
f51dd440e8 Nuke voidsuits, unnecessary 2015-10-11 15:35:47 -07:00
Robertha89
e2f91d4bd7 Fixes redundancy 2015-10-11 23:55:17 +02:00
Robertha89
b17b6a7225 Fixes my derp 2015-10-11 23:34:19 +02:00
Robertha89
b1e5c58867 Fixes reagent scanner not showing time of death correctly 2015-10-11 22:40:26 +02:00
Fox-McCloud
4c5706bc3a more...fixes 2015-10-10 08:52:35 -04:00
Tigercat2000
545c38a79b Merge remote-tracking branch 'upstream/master' into third_times_the_charm_questionmark 
Conflicts:
	code/game/objects/items.dm
 2015-10-08 11:16:30 -07:00
Tigercat2000
514a09bf0c Fixes, Icons 2015-10-08 11:13:48 -07:00
Fox McCloud
dddfff41b4 Merge pull request #2305 from tigercat2000/intelli_card_nano 
NanoUI Intellicards
 2015-10-06 23:35:01 -04:00
Tigercat2000
4fc91429e5 Baystation Rigsuits 
This commit adds baystation's rigsuit system on top of our own hardsuits;
Our own hardsuits still function fine and are around, but these are
available to admins. Next commit will contain balancing and player
implementation stuff.
 2015-10-05 16:42:00 -07:00
Tigercat2000
7e231f9ed5 NanoUI Intellicards 
This add NanoUI to IntelliCard's.
 2015-10-05 16:36:32 -07:00
Tigercat2000
ec747b9f04 Size tweaks, less snowflakey syndieborg radio 2015-10-05 09:31:11 -07:00
Tigercat2000
9a6b5c2749 Upgrade radios to NanoUI 
Things changed:
 - All radios now use nanoUI
 - Syndicate mode for any radios with syndicate access!
 - Electropacks also upgraded, since they are technically radios
 - Fancy as a motherfucker
 2015-10-05 08:28:52 -07:00
Tigercat2000
d0af69afd5 Spanssss 2015-09-30 13:45:54 -07:00
Tigercat2000
c4fa813331 Remove remaining arbitrary restrictions on has_fine_manip 
This commit removes all (most) of the remaining code limiting xenomorphs
that have has_fine_manipulation on an entirely arbitrary basis. Xenomorphs
with has_fine_manipulation may now interact with NanoUI, and will only
break computers on non-help intent. The can also tear down walls, since
walls used an ishuman check in place of an isAdvancedToolUser check as
they should have.

Minor refactor to machinery.dm as well; Instead of the slightly
(completely) insane attack_hand restriction to humans and silicons (it was
a multi-line IF, why), it now checks user.IsAdvancedToolUser(); This means
restrictions on monkies will actually function properly now.
 2015-09-30 10:50:10 -07:00
Fox McCloud
15c9873cdf Merge pull request #2224 from Markolie/shitcode 
Strange reagent fix, tod --> timeofdeath
 2015-09-29 18:25:04 -04:00
Markolie
8b2e62fc10 Strange reagent fix, tod --> timeofdeath 2015-09-29 22:03:04 +02:00
Crazylemon
734e0842e2 Fixed a few more reversed add_logs 
Did a search, and found 3 of these to patch up. Perhaps there's
something left, perhaps not.
 2015-09-29 11:56:51 -07:00
DZD
b990b6c71b Merge remote-tracking branch 'upstream/master' into vision 2015-09-28 19:03:14 -04:00
Markolie
f7fe8c8c6f Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into fixes3 
Conflicts:
	_maps/map_files/cyberiad/cyberiad.dmm
 2015-09-28 03:05:04 +02:00
Mark van Alphen
48a3d1ab9a Merge pull request #2176 from Fox-McCloud/janicarts-and-janitors 
Janicart and Janitor Update
 2015-09-28 03:02:04 +02:00
Fox-McCloud
d7f23f4271 Oh, that kind of list 2015-09-27 19:39:09 -04:00
Fox-McCloud
155afc6131 lists 2015-09-27 19:24:35 -04:00
DZD
0ceaf664af Fix merge conflicts 2015-09-27 11:24:51 -04:00
Fox-McCloud
d743fb1d1a pda janitor cart fixup 2015-09-27 04:48:04 -04:00