cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-06 07:23:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,990 Commits 7 Branches 0 Tags
a3340e797e7bcceb214e159785943e476085e9ea
Commit Graph

12618 Commits

Author SHA1 Message Date
Chinsky
a3340e797e Merge pull request #4980 from Loganbacca/clickfix 
Invulnerable windows fix
 2014-05-14 03:51:21 +04:00
Loganbacca
25983be804 Added exception for breaking full tile windows on top of single pane windows 2014-05-13 23:29:11 +12:00
bs12-bot
1f614c3149 Merge pull request #4971 from Ravensdale/and_yeah_he_doth_spake-let_there_be_light 
Fixes runtime with yellow slime extracts.
 2014-05-12 19:02:31 +01:00
Ccomp5950
08687ecfde Merge pull request #4966 from Loganbacca/bayfix 
Compressed matter implanter fix
 2014-05-12 11:40:31 -05:00
Ravensdale
8e15a76da1 Fixes runtime with yellow slime extracts. 2014-05-12 01:15:45 -07:00
Loganbacca
f32d281132 Compressed matter implanter fix 
Compressed matter implanters will now correctly remove the compressed item from the game world if it is in an inventory (player or storage container).
 2014-05-11 18:30:18 +12:00
Mloc-Hibernia
1d2ce01039 mob: fix #4955 
Name parameter to track wasn't sanitized correctly.

Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>
 2014-05-10 22:33:33 +00:00
Chinsky
963216b43b Merge pull request #4952 from Mloc/bs12-mineturfs 
mining: fix for mining cooling down
 2014-05-11 01:47:30 +04:00
Chinsky
799c279a86 Merge pull request #4950 from Mloc/bs12-pipefixes 
Map fixes
 2014-05-11 01:47:18 +04:00
Chinsky
3e52109077 Merge pull request #4949 from Zuhayr/master 
Fixes.
 2014-05-10 13:02:23 +04:00
Ccomp5950
69148b4dc9 Merge pull request #4953 from Loganbacca/bayfix 
Ore duplication bug fix
 2014-05-10 03:23:20 -05:00
Ccomp5950
4243b1ed61 Merge pull request #4943 from Intercross21/master 
Special color for antagonists in logs and fix of alien whitelist
 2014-05-10 03:17:15 -05:00
Loganbacca
b3af8e8936 Ore duplication bug fix 
Fixes #4951
 2014-05-10 14:32:08 +12:00
Zuhayr
a68c4e9c55 Fixes #3993 2014-05-10 10:26:05 +09:30
Mloc-Argent
0911bbd0e7 mining: fix for mining cooling down 
Hacky thing that was already done to space. TCMB->T0C

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-05-09 22:47:55 +01:00
Mloc-Argent
c9a2a4fad0 power: cables show up right on map again 
Cables are red/whatever color on map again instead of white.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-05-09 18:53:44 +01:00
Chinsky
c9a658db0d Merge pull request #4945 from Ccomp5950/adminoops 
Re-adds Show Player Panel right click menu on players.
 2014-05-09 20:47:30 +04:00
Zuhayr
8d6b5e6d5c Fixes #4911 2014-05-10 01:23:29 +09:30
Zuhayr
a95dd47de3 Fixes #4744 2014-05-10 00:40:20 +09:30
Zuhayr
1dc85149ce Fixes #4716 2014-05-10 00:33:09 +09:30
Zuhayr
9f2f5fb488 Fixes #4808 2014-05-10 00:30:03 +09:30
Zuhayr
1e63e27f3b Fixes #4918 2014-05-10 00:27:18 +09:30
Loganbacca
c697b7a9b6 Null message fix 
Fixes the "User places  in the glass ashtray" messages having a null object name.
 2014-05-10 00:37:48 +12:00
Zuhayr
4d64af69f4 Fixes #4923 2014-05-09 21:29:44 +09:30
Ccomp5950
e4089f2fd0 Re-adds Show Player Panel right click menu on players. 2014-05-09 05:41:43 -05:00
Intercross21
1f261fdadd Fix for alien whitelist 2014-05-09 09:20:55 +04:00
Chinsky
5426670a3d Merge pull request #4938 from Ccomp5950/banned_strikethrough 
Jobs you can't select are struckthrough instead of just being red.
 2014-05-08 13:26:37 +04:00
Chinsky
2c9faec5c4 Merge pull request #4937 from Ccomp5950/player_age_fix 
Bugfix:  Brand new players will have a client.player_age of 0
 2014-05-08 13:25:27 +04:00
Chinsky
520ae404ed Merge pull request #4931 from Mloc/bs12-rsv 
voting: failed gamemode votes will undelay too
 2014-05-08 13:20:27 +04:00
Chinsky
dbc6011018 Merge pull request #4928 from Ccomp5950/bugfixs 
[Bugfix] Fixes partial prints.
 2014-05-08 13:10:48 +04:00
Ccomp5950
1f6ec81e40 Jobs you can't select are struckthrough instead of just being red. 
Before:  It's going to be kinda confusing when a new player goes to setup their jobs and they see this: http://i.imgur.com/miK9Isk.png
Specifically "unavailable occupations are in red" and then a list of days till they can play that role but also RED [NEVER] which to a new player migth cause confusion thinking
they can never play that role.

After:  Remove the red and add a strikethrough ( http://i.imgur.com/BQ90xr6.png  ) to show "these jobs are unavailable" while making the other jobs look, well more available.
 2014-05-08 01:05:12 -05:00
Ccomp5950
535840f0ae Bugfix: Brand new players will have a client.player_age of 0 
Before:  When a client is created it's player_age variable is set to "Requires Database", then a select query is ran against the database to see if they have been seen before if they have logged in before this will have a row for them and it will set player age.  However if there is no row for them it doesn't change player_age from default.

After:   Before we check for an entry in the database we set their player_age to zero, we already checked we have a database connection so we know we will be able to pull this information and if we can't then it means they are a new player.  Set their player_age to zero and be done with it.

What this does:  Brand new players will no longer be able to bypass the jobs minimal age limit.
 2014-05-08 00:18:06 -05:00
Zuhayr
601d4516ad Merge pull request #4927 from Ccomp5950/muzzle-fix 
Stops muzzled folks from talking.
 2014-05-08 11:05:25 +09:30
Mloc
fa6e32ca5c Merge pull request #4922 from mwerezak/power 
Fixed cell chargers being infinite energy sources.
 2014-05-07 21:48:54 +01:00
Ccomp5950
37e33cba9a AdminPM fixes 
Invisimins won't show what their rank is it will simply say "Admin"

Non-staff won't get to see the adminlink (?)

People receiving adminPM's won't get the wrong version of it allowing them to only reply to themselves.

Removed the commented out stuffs.
 2014-05-07 13:56:25 -05:00
Ccomp5950
b7d455a64b [Bugfix] Fixes partial prints. 
Playays will now no longer leave complete prints from touching an item once.

Instead they will leave a partial print, that has a high chance of leaving more and more with each touch.

You have a 1/100 chance of leaving a full set of prints on your first touch.

Fixes #4176
 2014-05-07 02:17:08 -05:00
Ccomp5950
1861c7607f Stops muzzled folks from talking. 2014-05-06 21:38:47 -05:00
Zuhayr
0d597fe8db Merge pull request #4912 from Ccomp5950/mentors 
Adds Mentors.
 2014-05-07 10:00:27 +09:30
Zuhayr
a1f6b7a211 Merge pull request #4885 from mwerezak/equipment-fixes 
Misc Equipment fixes - Mostly hardsuits
 2014-05-07 09:59:44 +09:30
Mike
36dbb67ceb Fixed air alarm heaters using 1000x less power... 
...than they should. Note that MAX_ENERGY_CHANGE is 1000, so air alarm
heaters will now draw a maximum of 1 kW instead of 1 W, much more
befitting of a heater.
 2014-05-06 20:12:40 -04:00
DJSnapshot
c0a53c52b7 Merge pull request #4913 from Zuhayr/master 
Changeling, nymph and robot fixes.
 2014-05-06 16:25:31 -07:00
Mike
59cb5af50e Updated PACMAN comments. 2014-05-06 16:45:54 -04:00
Mike
a538357b3e Fixed cell chargers being infinite energy sources 2014-05-06 16:43:16 -04:00
Mloc
e53d384321 Merge pull request #4909 from Ccomp5950/dionaea_say_code 
Dionaea nymphs now using new say code and get languages again.
 2014-05-05 20:56:27 +01:00
Intercross21
11eeecba66 Colored names in AH/PM for antagonists 2014-05-05 20:00:28 +04:00
Zuhayr
87d29b25fd Merge pull request #4916 from Intercross21/master 
And another hotfix for #4908
 2014-05-06 01:15:42 +09:30
Intercross21
0e40a3f2dd And little more fixes 2014-05-05 19:38:09 +04:00
Zuhayr
089e23d7f2 Merge pull request #4915 from Intercross21/master 
Emergency hotfix for #4908
 2014-05-06 01:05:26 +09:30
Intercross21
cef243188a AH with link 2014-05-05 19:25:50 +04:00
Zuhayr
6adb394450 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2014-05-05 23:44:49 +09:30