cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,917 Commits 10 Branches 0 Tags
47ded267fb87b214d4775185c3f10ff69ba4bcd3
Commit Graph

12556 Commits

Author SHA1 Message Date
Zuhayr
47ded267fb Merge pull request #4908 from Intercross21/master 
Some inner changes for admin verbs
 2014-05-05 23:37:49 +09:30
Intercross21
aa7ad269ae Little change: "show" button shows job only first time. Now shows job anytime. 2014-05-05 07:20:26 +04:00
Intercross21
e05efd0f1e New job menu for ID computer. 2014-05-04 22:06:56 +04:00
Mloc
8168635929 Merge pull request #4906 from Ccomp5950/herpderp 
Saycode herp derp.  client check checking speaker client instead of hearers
 2014-05-04 17:07:50 +01:00
Intercross21
d4ee83666e Now AH shows key, prefs.jobs not have scrollbar, prefs is fully visible except undo/save menus. 2014-05-04 19:41:14 +04:00
Ccomp5950
c7262a55d4 Merge pull request #4897 from Mloc/bs12-zeroburn 
zas: fix zburn /0 runtime
 2014-05-04 10:06:02 -05:00
Intercross21
11e5c64c78 Unified interface for options of admin 2014-05-04 18:37:42 +04:00
Ccomp5950
3739ed03ff Merge pull request #4905 from Jarcolr/properhudobject 
Cyborg hud modules now have proper icon states
 2014-05-04 09:36:32 -05:00
Ccomp5950
93bee94c10 Saycode herp derp. client check checking speaker client instead of hearers. 2014-05-04 09:27:14 -05:00
Intercross21
02ce933297 Larger job and preferences windows but still lesser than 764. More choices in "Quick Create Object" menu. 2014-05-04 18:11:11 +04:00
Jarcolr
e050251c81 Cyborg hud modules now have proper icons 
Before: http://puu.sh/8yK5W.png
After: http://puu.sh/8yKYc.png
 2014-05-04 16:06:10 +03:00
Mloc
ce376eda1d Merge pull request #4894 from Zuhayr/master 
IPC fixes.
 2014-05-04 13:49:00 +01:00
Mloc-Argent
3fb37ade17 zas: fix zburn /0 runtime 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-05-03 17:40:35 +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
Zuhayr
0e39f18763 Compile fix. 2014-05-03 23:17:08 +09:30
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
Zuhayr
5ef994337b Fix for previous commit. 2014-05-03 20:13:20 +09:30
Zuhayr
0dfe70fe2b IPC will no longer take damage from walking in glass. Not sure why this was happening beforehand. 2014-05-03 20:08:45 +09:30
Mloc
5586439dc8 Merge pull request #4878 from mwerezak/horsemask 
Fixes  #4780
 2014-05-03 11:06:41 +01:00
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
Mike
d684a77119 Fixes #4780 2014-05-01 23:58:47 -04: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
Chinsky
78a381eff5 Merge pull request #4864 from Ravensdale/zetubes 
Fix for problem #2891
 2014-05-01 03:39:04 +04: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
Chinsky
eb6a34679f Merge pull request #4861 from Ccomp5950/oops 
Oops fix, "right_ear" and "left_ear" shouldn't have an underscore.
 2014-05-01 03:13:14 +04:00
Mike
fc7946a308 Fixed #4850 
Cutting wires from stun gloves cuts the fingertips off randomly
 2014-04-30 14:11:34 -04:00
Ravensdale
b8696668a7 Fix for problem #2891 2014-04-30 08:20:44 -07:00
Mike
f3b0ee8a43 Fixes #4856 
Shotgun pumping not playing
 2014-04-30 10:38:30 -04:00
Mloc-Hibernia
2040c5a720 controllers: make process_machines more profilable 
Splits process_machines() into 3 procs for its actions, trying to
figure out which is causing the lagspikes.

Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>
 2014-04-30 09:56:55 +00:00
Ccomp5950
df0fe76155 Ooops fix, "right_ear" should be "right ear". 2014-04-30 04:03:55 -05:00
Chinsky
d709c3c9c5 Merge pull request #4853 from Ccomp5950/ghostwrite_runtime 
Fixes runtime that stops ghosts from ghostwriting...yay 4 month old bugs
 2014-04-30 04:05:47 +04: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
Mloc
ca67af9d4f Merge pull request #4846 from Ccomp5950/ear_fix 
Radio :r and :l fixes and feature.
 2014-04-29 09:38:53 +01:00
Ccomp5950
e3dd035aa7 Fixes runtime that stops ghosts from ghostwriting...yay 4 month old bugs. 2014-04-29 03:30:50 -05:00
Ccomp5950
085c209651 Merge pull request #4845 from RavingManiac/master 
Inflatable barrier fixes
 2014-04-28 12:08:50 -05: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