cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
20,419 Commits 5 Branches 0 Tags
c764a940737ec77f41b211708e738f9d06dc1b17
Commit Graph

206 Commits

Author SHA1 Message Date
Zuhayr
305416d5c5 Merg resolution. 2014-10-02 02:33:06 +09:30
Chinsky
dd9b3fe613 Merge pull request #6565 from Mloc/bs12-fan 
small fixes 2
 2014-10-01 13:39:35 +04:00
Mloc
bb2953b283 re-port trange() from tg 
was lost in the multiz update

Signed-off-by: Mloc <colmohici@gmail.com>
 2014-10-01 08:50:28 +01:00
Mloc-Argent
43546fe9f0 fix stretched lighting 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-09-30 20:51:58 +01:00
Chinsky
69ed2317bf Merge pull request #6428 from atlantiscze/cyborg-power 
Cyborg power overhaul
 2014-09-25 00:19:13 +04:00
Zuhayr
0c83a95b90 Large merge resultion. Used remote for map conflicts. 2014-09-23 21:41:54 +09:30
Atlantiscze
ded8e21c0f Cyborg Power Usage Overhaul 
- Adds new standardised proc for power usage as Cyborg
- Each component now uses different amount of power. Some components use "idle" power (camera), which means constant load. Other components use "active" power, which is single-time burst load.. Example: Actuator.
- Power usage is directly proportional to work done. Moving cyborg uses more power than still cyborg.
- Information in Status tab changed. Now it only shows percentage of remaining charge, as well as cell rating and cell load (W)
 2014-09-17 07:31:20 +02:00
Zuhayr
1eb759447e Merge resolution, using dev-freeze map due to unreconcilable conflicts. 2014-09-13 16:54:48 +09:30
Mloc-Argent
712e209ab6 Merge remote-tracking branch 'upstream/master' into dev 
Conflicts:
	code/__HELPERS/text.dm
	code/game/machinery/podmen.dm
	code/game/machinery/vending.dm
	code/game/objects/items/candle.dm
	code/game/objects/items/devices/PDA/cart.dm
	code/modules/clothing/suits/jobs.dm
 2014-09-10 22:14:37 +01:00
PsiOmega
ff39ceff9c Emergency shutters down have pressure/temperature difference overlays. 
Based on the emergency shutter from Paradise.
 2014-09-09 15:57:33 +02:00
Whitellama
71c2317264 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into flame 
Conflicts:
	code/game/objects/items/weapons/storage/belt.dm
 2014-09-01 18:31:26 -07:00
Zuhayr
53bee60a27 Merge resolution. 2014-09-02 09:18:20 +09:30
JimTheCactus
eaa641adbd Fixes sanitizeSQL proc 
Resolved an issue where an extra character was being removed.
 2014-08-31 21:28:24 -06:00
Whitellama
f5c9586153 Fixed matches and candles not being able to burn papers. Also made Diona join prompt appear for a bit longer. 2014-08-31 02:12:04 -07:00
Kelenius
a1348faa8c Cables are now stacks 2014-08-25 18:54:35 +04:00
PsiOmega
e21da52af9 Atmospherics computer now displays a sorted list of air alarms 2014-08-23 15:23:14 +02:00
Chinsky
871456f131 Merge pull request #6084 from PsiOmegaDelta/MoreNounce 
Announcement Refactoring
 2014-08-21 21:53:03 +04:00
PsiOmega
f9df93fad0 Expands the use of the new announcement system. 
Code Green/Blue/Red/Delta, ERT, and captain annoncements now use the new announcement system.
These announcements are stored as newscasts.
 2014-08-21 12:58:02 +02:00
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