cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-02-01 12:12:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,735 Commits 12 Branches 0 Tags
cfdb3288e76d6bdede95dffbf68bbe53069e73bc
Commit Graph

8143 Commits

Author SHA1 Message Date
Walter0o
cfdb3288e7 derping derps 
thanks to @mwerezak
 2014-07-31 12:12:30 +02:00
Walter0o
eeb02dcfde derp 2014-07-31 10:43:51 +02:00
Walter0o
ca78cb238a cyborg topic exploit fixes 
all kinds of fun here
 2014-07-31 10:20:24 +02:00
Walter0o
f0042741fc filing cabinet exploit fix 
hooray for teleporting atoms to you via magic office furniture
 2014-07-31 10:03:22 +02:00
Walter0o
f9de5e3866 refining the clipboard topic checks 2014-07-31 08:57:56 +02:00
Walter0o
596ae37794 paper exploit fixes 
i think my favourite part of this was
```var/obj/item/i = usr.get_active_hand()
if( ...  && usr.get_active_hand() != i))```
 2014-07-31 05:01:31 +02:00
Walter0o
67e58effd2 folder exploit fixes 2014-07-31 04:08:34 +02:00
Walter0o
404a89aed6 clipboard exploit fixes 2014-07-31 04:01:14 +02:00
Chinsky
1150331bc4 Merge pull request #5828 from mwerezak/wound-infections 
Fixes chest not being coloured by necrosis
 2014-07-29 18:13:02 +04:00
Chinsky
4d8db295d8 Merge pull request #5814 from JimTheCactus/polaroid 
Improves Polaroid Camera Images
 2014-07-29 17:57:41 +04:00
mwerezak
9680cd85b7 Fixes chest not being coloured by necrosis 2014-07-28 20:51:04 -04:00
JimTheCactus
f5df1acaaa Added handler for pixel stepping 2014-07-28 13:05:29 -06:00
JimTheCactus
6b1f696203 Ported multi-turf behavior 
This allows for layering that moves across tiles and enables alternate methods of enumerating the tile list (not used at present.)
 2014-07-28 12:44:42 -06:00
JimTheCactus
f0594b6e21 Made camera render turf effects. 2014-07-28 12:10:21 -06:00
JimTheCactus
df3fcbc9b2 Ported nearest-neighbor scaling from TG 2014-07-28 11:54:01 -06:00
Loganbacca
5457cee527 More train fixes 
- No passing plastic flaps
- Only human based mobs can board trains
- Adjacent checks for exiting vehicles
- Cleaned up as many direct loc moves as possible
- Places removed cells in the removers hand
 2014-07-28 20:39:42 +12: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
Zuhayr
da42b20039 Merge pull request #5794 from Loganbacca/cups 
Cup grammar fix
 2014-07-28 10:11:57 +09:30
Loganbacca
4861c5a5d4 Grammar tweak 2014-07-28 07:38:24 +12:00
Chinsky
ed5b05772f Merge pull request #5777 from Loganbacca/trainfix 
Cargo train fixes
 2014-07-27 14:46:45 +04:00
Chinsky
c9d862b89a Merge pull request #5783 from Walter0o/master 
fixes nullpointer caused by broken organ list reading
 2014-07-27 14:46:31 +04:00
Loganbacca
fbc9b03e73 Cup fix 
- Grammar fix for drinking from cups
- Changed "Glass of Tomato juf" to "Glass of Tomato juice" (I'm assuming this was a typo)
 2014-07-27 20:04:45 +12:00
Chinsky
5fe8865f95 Merge pull request #5771 from JimTheCactus/name_fix 
Added check for blank on name entry
 2014-07-27 05:04:05 +04:00
JimTheCactus
0b7e858000 Changes check to an isnull rather than a truth test 
This allows the client to detect the difference between a blank and someone pressing cancel.
 2014-07-26 16:19:14 -06:00
Chinsky
c34cf89a04 Merge pull request #5784 from Jarcolr/patch-3 
Fixes #5691
 2014-07-26 17:18:38 +04:00
Jarcolr
9e233f1597 Fixes #5691 
Chef >> Chefhat
 2014-07-26 13:41:43 +03:00
Walter0o
23811e7e5c fixes nullpointer caused by broken organ list 
the mysterious broken list bug has struck again
 2014-07-26 11:54:32 +02:00
Jarcolr
17f86962ac Fixes #5773 
Added /obj/item/weapon/FixOVein to surgery cyborg modules.
 2014-07-26 12:50:41 +03:00
Loganbacca
99f755b986 Cargo train fixes 
- Adds overlay for cargo tug sprite
- Fixes failure feedback when successfully loading items on the train
- Stopped unnecessary loading failure feedback (like loading floors on trains, which will always fail)
- Stopped "hit" message when relabeling with the hand labeler
 2014-07-26 17:55:30 +12:00
DJSnapshot
d4ce124fe0 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into hotfix 2014-07-25 19:37:10 -07:00
DJSnapshot
9be6de1e77 fixes admin show-skills verb. 2014-07-25 19:34:13 -07:00
JimTheCactus
b0db2ba347 Added check for blank on name entry 
Since cancel just returns a blank this checks for that and doesn't raise an error.
 2014-07-25 19:36:58 -06:00
DJSnapshot
de282a4e2a Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 
Conflicts:
	code/modules/client/preferences.dm
 2014-07-25 17:19:59 -07:00
Chinsky
f33e11383b Merge pull request #5751 from DJSnapshot/hotfix 
Bug Fixes!
 2014-07-26 03:28:54 +04:00
Zuhayr
b32bbf8d2c Merge pull request #5741 from mwerezak/wound-infections 
Attempts to prevent ninja infections, body temperature fix, icon fix
 2014-07-26 01:30:12 +09:30
Zuhayr
57b790ad92 Merging. 2014-07-25 22:50:35 +09:30
DJSnapshot
2c7bb6c48d Remerged Siik'maas and siik'tajr together as per the tajara maintainer's request. 2014-07-24 17:01:52 -07:00
Loganbacca
31fe0d5e34 Cargo train fixes 
- Visual tweak for mobs on trolleys
- Fixed a teleportation bug when boarding trains from other trains
- Fixed a runtime involving on_click code
 2014-07-24 20:14:58 +12:00
Loganbacca
1b1e4bc118 Cargo train update 
- Adds sprites (thanks to Bishop)
- Adds order-able train cargo crates
 2014-07-24 18:01:10 +12:00
DJSnapshot
bb336b7691 temporary fix for #4907 2014-07-23 21:48:32 -07:00
DJSnapshot
f8d478fcbb Updates to gun targeting UI. Fixes #5710 2014-07-23 20:51:58 -07:00
mwerezak
78e4e259db Fixes icons not being updated for necrosis 2014-07-23 22:41:52 -04:00
mwerezak
d9f70c2fd2 Adjusts the rate that infections deal toxin damage 2014-07-23 22:35:04 -04:00
mwerezak
60c6a2ea92 Fixes fever temperature not being reached 2014-07-23 22:34:04 -04:00
Zuhayr
61d38a3e86 Merge pull request #5740 from Ccomp5950/taser_slow_down 
Tasers will now cause movement slow downs on the first hit
 2014-07-23 17:46:55 +09:30
Ccomp5950
fe9785d630 Tasers will now cause movement slow downs on the first hit 
Before:  Tasers do 40 halloss damage and that drops to 39 on next life() tick so most people won't be slowed down by the first taser hit.

After:  If you have any halloss you will slow down some.  I've set it at 1 delay for every 10 halloss, this might need adjusting (15 instead of 10 possibly)
 2014-07-23 02:55:37 -05:00
Ccomp5950
98abc5bfc4 Compromise on speach_sound, will check distance instead of just checking if ghost. 2014-07-23 01:48:48 -05:00
Ccomp5950
477d32ff64 Ghosts will no longer hear clientless mobs random talking unless they are in view. 
Experiment 97B says, 'EHEHEHEHEHEHEHE!'
 2014-07-22 19:33:56 -05:00