cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,395 Commits 8 Branches 0 Tags
b47d91b612a055af91aa692be99be6d7a24f90da
Commit Graph

188 Commits

Author SHA1 Message Date
Zuhayr
b47d91b612 Merge resolution, master into dev. 2014-08-21 12:01:38 +09:30
MrStonedOne
873c15178c Fixes sql errors caused by odd and unexpected behavor in dbcon.Quote() 2014-08-18 14:07:14 +01:00
MrStonedOne
f396b94068 SQL injection fix. 
Google sanitizing sql input. almost every single article explains why you should never attempt to roll your own function to do this.
 2014-08-18 14:07:04 +01:00
Chinsky
1c5e944ce5 Merge pull request #5954 from Zuhayr/dev 
No one is going to read this all anyway
 2014-08-13 18:33:09 +04:00
Chinsky
37ad0e3c1c Changed optable so it would not care why victim is lying down. It would only accept victim if it was resting, so sometimes it would not recognize lying mobs as valid victims, leading to lots of unfun in surgery. 
Updated surgery helper to account for that, also cleaned it up a little with replacing all the possible causes of lying down with just lying check. It's all checked in can_move already.
 2014-08-11 19:07:19 +04:00
Zuhayr
f09d1218fe Master to dev merge. 2014-08-11 17:23:40 +09:30
JimTheCactus
e02cfbec8c Tidy up and use more sane defaults. 2014-07-31 22:17:26 -06:00
JimTheCactus
718b94fa3a Modified function such that the atom isn't used in the defaults. 
This caused the routine to crash when the atom didn't have an icon or was null.
 2014-07-31 21:46:00 -06:00
Chinsky
fcdca5ca5b Merge pull request #5832 from Baystation12/master 
master - > dev
 2014-07-29 18:37:19 +04:00
JimTheCactus
df3fcbc9b2 Ported nearest-neighbor scaling from TG 2014-07-28 11:54:01 -06:00
JimTheCactus
8e4ac0a807 Modified to check every pixel 
Checking only a few pixels had the tendancy to turn my charcter's head inside out when I was pointing directions other than south. Worse case is 1024 tests per object in the image. This test should be uncommon and the CPU usage is constrained by other factors.
 2014-07-28 01:46:07 -06:00
JimTheCactus
bdbc404d07 Added workaround for non-directional icons with dir!=2 
Several items in the map are set with a dir other than 2 but the icon associated with the item doesn't have directions. As such they misrender.

This resolves that specific issue, for the most part. Due to an odd behavior of Byond, when this circumstance occurs the icon proc produces a 32x32 image that is all alpha 0. At least that's what my testing suggests; it may be possible with large icons to encounter this as an issue and cause it to ignore an icon that should be reloaded from the default. However, this can't do any worse than the current software.
 2014-07-28 01:04:52 -06:00
JimTheCactus
1d7310c49d Patched display and dealt with lying. 2014-07-27 22:05:24 -06:00
JimTheCactus
646aad945e Merged getFlatIcon rendering from tgstation 
Based on tgstation #2826. This is not all of it though.
 2014-07-27 17:21:19 -06:00
Whitellama
8f1417f14c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into flavourtext 2014-07-26 17:09:12 -07:00
Whitellama
0528675846 Added dynamic flavour text, where covered bodyparts' flavour isn't displayed 2014-07-26 17:08:55 -07:00
Ccomp5950
2acf93215b Added . and # prefix to language keys checks (like radios) 
Fixes #5748
 2014-07-23 21:58:50 -05:00
Mloc-Argent
38c5b38017 helpers: fix move_contents_to() not moving air 
fixes #5232

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-06-30 23:21:29 +01:00
DJSnapshot
488c4f4b84 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into laptop 
Conflicts:
	code/setup.dm
 2014-06-23 00:25:39 -07:00
DJSnapshot
9de9dab362 Initial commit of Computer 3 from Paradise, along with a bunch of fixes. 2014-06-22 02:08:42 -07:00
Ccomp5950
68d01b00ab Merge pull request #5297 from comma/fancy 
Nextgen lights
 2014-06-20 20:30:11 -05:00
Chinsky
9e3ad09b8c Shortened helper. 
Added new helper for alternative mixing.
 2014-06-18 23:44:11 +04:00
Chinsky
f79e151ba7 Shortened helper procs a little. 2014-06-18 10:55:38 +04:00
Chinsky
161b37fca0 Got vgstation13 colored lights rewrite working here. 2014-06-17 22:35:23 +04:00
Chinsky
be95e54e43 Merge branch 'master' into dev 
Conflicts:
	code/defines/obj/weapon.dm
	code/modules/mob/living/carbon/species.dm
	code/modules/mob/living/silicon/say.dm
	icons/mob/uniform.dmi
	maps/tgstation2.dmm
 2014-06-17 16:16:44 +04:00
Chinsky
1ca6a54d3a Merge pull request #5265 from mwerezak/wound-fixes 
Fixes the wounding system
 2014-06-17 14:41:22 +04:00
mwerezak
274b03b083 Adds thrown object sharp and edge flags 2014-06-16 23:21:01 -04:00
mwerezak
1b33ca943d Separates the sharp flag into edge and sharp 
Now weapons can properly cause cuts without necessarily having a greater
chance to remove limbs.

Also separates is_sharp, has_edge, and can_puncture.
 2014-06-15 20:25:39 -04:00
Mloc-Argent
9896e44d8a Merge remote-tracking branch 'upstream/master' into dev 
Conflicts:
	code/__HELPERS/unsorted.dm
 2014-06-12 18:56:26 +01:00
Chinsky
238d5dfc2a Merge pull request #5211 from Ccomp5950/mentor_change 
Mentor permissions fixes and such.
 2014-06-11 13:16:18 +04:00
Ccomp5950
77c733b17c Mentor permissions fixes and such. 
Created a helper proc /proc/is_mentor(client) use this when determining if someone is a mentor and they aren't the usr of the proc (rights_check uses usr)

Mentors will no longer hear ghosts while playing
Mentors will no longer see orange text around names in check_player_age panel if they have special_roles
Mentors will no longer be able to tell players with special roles through the use of player_panel
Mentors will no longer be able to aghost, use antagHUD, then return to their bodies.
 2014-06-10 19:48:41 -05:00
mwerezak
a8816823a5 Replaces get_turf_loc() with get_turf() 
The former does exactly the same thing as get_turf(), except it runtimes
if one of the atoms has a null loc.
 2014-06-10 13:43:11 -04:00
unknown
58700869fe Fixes #5190 2014-06-09 12:35:00 -04:00
Jeremy Liberman
2a6e6bb021 Merge branch 'dev' into mutiny 2014-06-03 21:27:42 -05:00
Jeremy Liberman
dc67453796 Prevents mindless candidates for mutiny mode, adds loyalists/mutineers to AntagHUD, allows admins to reassign heads, and adds remaining Directive X objectives to Check Antagonists panel. 2014-06-03 21:26:34 -05:00
GinjaNinja32
42d8344f7d Change crew monitoring computer to use NanoUI 2014-06-02 09:29:34 +01:00
Zuhayr
1e135f91af Merge resolution with master. 2014-06-02 12:05:12 +09:30
Mloc-Argent
3d2cc3cd82 Revert "Merge pull request #4985 from jack-fractal/dev" 
This reverts commit 1679b4062f, reversing
changes made to b149b273d9.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/datums/visibility_networks/update_triggers.dm
 2014-05-31 00:25:56 +01:00
Jeremy Liberman
d3541d1e08 Merge branch 'dev' into mutiny 2014-05-25 14:22:16 -05:00
Ccomp5950
0ca4aaa316 Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev 2014-05-24 19:03:51 -05:00
Ccomp5950
ff0d667337 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze 2014-05-24 19:02:16 -05:00
Jeremy Liberman
a95a28e303 Merge branch 'dev' into mutiny-fixes 2014-05-18 11:25:36 -05:00
mwerezak
c44f11b0e5 Fixes language_keys not initialized correctly 
Also prevents speech ending verb from overriding language verb for
humans.
 2014-05-17 14:38:11 -04:00
mwerezak
c643da6198 Silicon mob types can now speak languages 2014-05-17 08:39:40 -04:00
Zuhayr
1679b4062f Merge pull request #4985 from jack-fractal/dev 
Masks of Nar'sie - Testing Version
 2014-05-17 14:01:00 +09:30
Chinsky
91751cb56d Merge pull request #5005 from Zuhayr/mobcache 
Caching system for human icons, generalized breathing.
 2014-05-17 07:57:54 +04:00
jack-fractal
bd3eeca855 fixing the player panel to work with spirits and masks 2014-05-16 19:19:22 -04:00
Ccomp5950
cb093122d2 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev 2014-05-16 18:11:11 -05:00
Mike
824f9ceea8 do_after() checks both turf and loc 2014-05-16 13:13:02 -04:00
Loganbacca
78e0224649 Fixed resisting out of lockers 2014-05-15 23:03:21 +12:00