cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,914 Commits 5 Branches 0 Tags
c44e7b0e5668d2d8bcd7da123f6cecc2ea21da6d
Commit Graph

7204 Commits

Author SHA1 Message Date
Zuhayr
ffdba855fa Fixes #3741 2014-05-05 14:50:22 +09:30
Zuhayr
48262ae9dc Robots will now take burn damage from appropriate projectiles, rather than recieving brute. 2014-05-05 14:49:25 +09:30
Ccomp5950
93bee94c10 Saycode herp derp. client check checking speaker client instead of hearers. 2014-05-04 09:27:14 -05:00
Mloc
ce376eda1d Merge pull request #4894 from Zuhayr/master 
IPC fixes.
 2014-05-04 13:49:00 +01:00
Mloc
6683cece0b Merge pull request #4895 from Ccomp5950/irc-pm-fix 
Canceling an IRC-adminPM will not send a blank message.
 2014-05-03 17:10:27 +01:00
Ccomp5950
ed25b7c870 Canceling an IRC-adminPM will not send a blank message. 
Ooops
 2014-05-03 09:27:59 -05:00
Ccomp5950
d2b5f24545 Trimming messages prior to say code processing. 
Hoping to fix any whitespace issues that stop processing of emotes and radio/language channels
 2014-05-03 08:44:26 -05:00
Zuhayr
3d693a5f38 Several IPC adjustments. 2014-05-03 21:29:10 +09:30
Zuhayr
1a2ad49b8e Removed 'You are now sterile' line from groin loss due to spam issues when lost by an IPC as well as general pointlessness. 2014-05-03 21:27:49 +09:30
Zuhayr
5b32150858 Fixes for previous commit, sigh. 2014-05-03 21:21:19 +09:30
Zuhayr
25c85d6e2a Adding some repair procs to cables and welders for IPC use. 2014-05-03 21:10:26 +09:30
Zuhayr
c526b9c29a Lousy goddamn indentation. 2014-05-03 21:09:55 +09:30
Zuhayr
378e6865d4 Attempting to stop IPC from eating and drinking. 2014-05-03 20:25:36 +09:30
Mloc
f0726e5cee Merge pull request #4881 from Ccomp5950/botfix 
Admin empowerment:  Allowing Admins in IRC to respond to ahelps
 2014-05-03 11:04:43 +01:00
Zuhayr
5bd34ff950 Merge pull request #4887 from Mloc/bs12-mprf2 
mob: fix for say code "randomly" breaking
 2014-05-03 12:13:07 +09:30
Mloc-Argent
56ea5c26bb mob: fix for say code "randomly" breaking 
There was a runtiming check for mob.locs[1] in living/say, that would
fail if a mob was in bluespace.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-05-02 22:28:21 +01:00
Ccomp5950
0c0af93601 You can now request player notes through IRC bots. 2014-05-02 08:16:47 -05:00
Mloc
3e7ac27061 Merge pull request #4868 from valzargaming/master 
Fixes gum.dm firerate
 2014-05-02 10:12:15 +01:00
Ccomp5950
d6717177ad IRC-AdminPM is limited to 400 characters. 2014-05-01 21:24:09 -05:00
Mloc
c1e6f9b0a6 Merge pull request #4866 from mwerezak/stunglove 
Fixes #4850
 2014-05-01 10:36:17 +01:00
valzargaming
5b289f53c5 Fixes gum.dm firerate 
Firerate will now properly report to the player what their firemode is set to.
 2014-04-30 18:23:42 -05:00
Chinsky
690be8e830 Merge pull request #4863 from mwerezak/shotgun-pump 
Fixes #4856
 2014-05-01 03:13:23 +04:00
Mike
fc7946a308 Fixed #4850 
Cutting wires from stun gloves cuts the fingertips off randomly
 2014-04-30 14:11:34 -04:00
Mike
f3b0ee8a43 Fixes #4856 
Shotgun pumping not playing
 2014-04-30 10:38:30 -04:00
Ccomp5950
df0fe76155 Ooops fix, "right_ear" should be "right ear". 2014-04-30 04:03:55 -05:00
Mloc
352f212689 Merge pull request #4848 from Ccomp5950/supermatter 
Deadlier supermatter.  If you don't add coolant, you will have a bad time
 2014-04-29 16:37:45 +01:00
Ccomp5950
44578b7832 Deadlier supermatter. If you don't add coolant, you will have a bad time. 
Before:  Supermatter would raise the temperature without taking into account how many moles it grabbed in it's "breath" meaning it was better that you had a lower pressure inside your engine chamber so the engine would spit back out it's "breath" and it couldn't heat up the engine room as much.

Now:	Supermatter will take into account the heat_capacity of the breath it takes and will heat up it up accordingly and proportional to how much energy it has.

Gone are the days you could run the supermatter engine without adding coolant.

Also:  Added a debugverb that setups the engine for you, the verb is based off of baystations map and areas and shouldn't require too much change to bring it in line for other servers.
 2014-04-28 11:42:48 -05:00
Ccomp5950
c8f98337a4 Radio :r and :l fixes and feature. 
If you have a hand held radio in your right hand and use :r it will send through it.
If you have a radio on both ears and no radio in your hand and use :r it will use the right side ear radio.

Priority is given to the radio in the hand over the ear but this fix should make both side happy, those that want it to be ears and those tht want it to be hand helds.
 2014-04-28 02:50:38 -05:00
Chinsky
f04383e184 Merge pull request #4840 from Ccomp5950/say-code-tweaks 
Say code tweaks (GhostRADIO, Unconscious folks and holopad talk ohmy!)
 2014-04-28 11:19:26 +04:00
Ccomp5950
0ef558cfa2 Paperbin fix, now doesn't silently fail if it has papers shoved into it. 2014-04-27 08:54:31 -05:00
Ccomp5950
343d04c726 Silicon emotes. 2014-04-27 00:06:19 -05:00
Ccomp5950
4572414a49 Holopad talk fixed. Was being truncated due to new bahavior of say_quote() 2014-04-26 18:45:16 -05:00
Ccomp5950
7a8180989d Ghosts with GHOSTRADIO on won't hear people talk into radios only the radio chatter. 
Unconscience folk will also not hear speech or radio.
 2014-04-26 18:40:48 -05:00
DJSnapshot
7964e7b784 Merge pull request #4837 from Ccomp5950/dept_radio_fix 
Misc saycode fixes.
 2014-04-26 00:35:26 -07:00
Ccomp5950
fdab05baef ghosts won't see the random names given to announcement AI's 2014-04-26 02:29:41 -05:00
Ccomp5950
c985ecb02d Eavesdrop range on people talking into headsets is right next to them again. 
Distance dropped from 3 to 1
 2014-04-26 01:09:19 -05:00
Ccomp5950
2f2a308bfc Drunks will slur again. whoops. 2014-04-26 01:03:53 -05:00
Ccomp5950
5da8ce2cba Humans can use :h again for their departments. 2014-04-26 00:03:56 -05:00
DJSnapshot
185f325944 fix for paper bin runtime 2014-04-25 21:42:59 -07:00
Ccomp5950
976ae06e6b Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze 
Conflicts:
	code/modules/mob/living/say.dm
	code/modules/paperwork/paper.dm
	code/modules/telesci/bscrystal.dm
	html/changelog.html
	icons/mob/uniform.dmi
	maps/tgstation2.dmm
 2014-04-25 21:14:58 -05:00
Ccomp5950
e548fe6e43 Crash fix attempt: Moving NanoUI resource file sending away from client/New() 
it's going in mob/Login() instead.
 2014-04-25 17:47:27 -05:00
Mloc
74ef3765d0 Merge pull request #4825 from DJSnapshot/hotfix 
IPC fixes
 2014-04-25 21:32:45 +01:00
DJSnapshot
9dcea4f753 Merge pull request #4826 from DJSnapshot/dev-freeze 
Fixes to carbon copy paper.
 2014-04-25 13:32:16 -07:00
DJSnapshot
a6fbde8f2f Fixes for Mloc, part 2. 2014-04-25 13:31:10 -07:00
DJSnapshot
4236966e76 fixed what Mloc pointed out. 2014-04-25 13:14:01 -07:00
DJSnapshot
bbf7b31ccd Fixes to carbon copy paper. Basically merging it with regular paper bins. 2014-04-25 12:59:50 -07:00
Ccomp5950
2b9833ce0b Monkies / Dionaea nymphs should be able to emote again as well as not talk while dead. 
Removed debug msg from broadcaster.dm (oops)
 2014-04-25 03:15:14 -05:00
Ccomp5950
8ce78cd616 Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into more-say-code-fixes 
Conflicts:
	code/modules/mob/hear_say.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
 2014-04-25 03:04:59 -05:00
Ccomp5950
6a325036b0 Derpfix on Telecoms broadcast message, should fix any problem with arrivals computer having many names. 2014-04-25 03:00:54 -05:00
Ccomp5950
93b398b4e6 Some more fixes. 
Derp fix on objects, we check mob contents instead of src.contents for any objects that can hear and pass hear_talk on to it.
Tape recorder will record the verb sent instead of doing it's own thing with verbs.
 2014-04-25 02:02:45 -05:00