cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,391 Commits 5 Branches 0 Tags
02e4bcc03d2d356b3ce2c1cdaee1d87a6b5032b7
Commit Graph

2459 Commits

Author SHA1 Message Date
Erthilo
13aa7558a6 TG: Fixes a pesky compile error in my last commit. 
Revision: r3756
Author: 	 vageyenaman
 2012-06-23 15:10:49 +01:00
Erthilo
dfb6676ebb TG: Not a whole lot going on in this commit, just more work on preparation for the 
traitor factions update. Added some new sprites and weapons.

New weapon: Delivery grenade. Can spawn an x amount of mob/object y in a
constant radius. It is currently used for carp and manhack delivery grenades.

!! Important !!: Certain telecomms computers were causing very nasty machine
disruption through some very silly mishap involving re-programming a computer's
network. Basically, it was breaking machine procs every time you messed with
them. This should hopefully make telecomms a lot more stable.

Fixed a bug where the reflexes nanoaug would not actually dodge the projectile
if the person was clicking directly inside the target's 32x32 border.

I changed around some core PDA messaging functions in preparation to PDA
Chatrooms (yes Legality it's happening). However I'm going to hold off actually
implementing it until Messycakes is either completed with his PDA UI overhaul or
just stops working on it.

Committed two patches from separate people in the forums. Chemical Cigarettes by
Neek (http://nanotrasen.com/phpBB3/viewtopic.php?f=16&t=8775) and Clicking
genetics blocks by Willox
(http://nanotrasen.com/phpBB3/viewtopic.php?f=16&t=8857). Check their respective
threads for more details. Sorry I couldn't get this earlier, guys!
Revision: r3755
Author: 	 vageyenaman
 2012-06-23 14:59:54 +01:00
Albert Iordache
7a22acef57 Merge pull request #1372 from caelaislinn/master 
anomaly bay tweaks
 2012-06-23 05:03:11 -07:00
Albert Iordache
146703b756 Merge pull request #1369 from CIB/master 
Optimized UpdateDamageIcon
 2012-06-23 05:01:48 -07:00
caelaislinn
97f8bcffff prevent an artifact from being analysed and harvested at the same time 
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-06-23 16:51:51 +10:00
caelaislinn
c282fbe866 correctly choose random dir on rebound 
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-06-23 16:24:37 +10:00
caelaislinn
0b38e9f13c crystal / beam collision tweaks 
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-06-23 15:24:25 +10:00
caelaislinn
fda643647a removed New() debug message 
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-06-23 15:19:55 +10:00
caelaislinn
b7e22da1d5 more artifact tweaks 
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-06-23 15:18:26 +10:00
cib
b1774030df Issue #1366: Optimized UpdateDamageIcon 2012-06-22 22:10:26 -07:00
caelaislinn
66769fec4f arty tweaks 
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-06-23 14:49:22 +10:00
caelaislinn
bd0bdb2506 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-06-23 11:44:40 +10:00
caelaislinn
16a9b2109f anomaly tweaks and fixes 
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-06-23 11:43:02 +10:00
SkyMarshal
f3b9285f05 Guns now have a different message for when they are fired by the auto-fire-mode. 2012-06-22 14:27:21 -07:00
SkyMarshal
616be6eed8 More while loop stuff, removed shitloads of unnecessary curly brackets in the map reader, fixed ED-209 projectiles 2012-06-22 14:10:48 -07:00
SkyMarshal
668f81c329 Some tweaks and fixes for UL and any while loops I find, as well as removing generally bad procs. 2012-06-22 12:50:45 -07:00
caelaislinn
0e21ed125a artifacts can be harvested and reused in a portable emitter, restructured artifacts, artifact analyses should go a lot smoother and faster now, additional bugfixes in general, moves some icons around to hopefully fix some bugs, additional strange rock formations should spawn now, dbs should work now, reworked the anomaly lab, redacted 
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-06-23 04:16:09 +10:00
Cael_Aislinn
81714b9b0b more arty tweaks 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-06-23 01:42:36 +10:00
Cael_Aislinn
952f240d4e fix for unable to find pad >.> 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-06-23 01:32:30 +10:00
Cael_Aislinn
835b1f2567 some more fixes 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-06-23 01:17:21 +10:00
Cael_Aislinn
6b61a58d2d fixes for (hopefully) some of the bugs that came up over the last few rounds 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-06-23 00:59:27 +10:00
Albert Iordache
167372833b Boosted the minimum and max power of light tubes 2012-06-22 15:46:54 +03:00
caelaislinn
d5821ddb99 artifact tweaks, added artifact catalogue database to anom lab 
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-06-22 16:31:43 +10:00
caelaislinn
b79d5253b0 gloves now prevent on-touch artifacts from activating, anomaly suits are pressure resistant, fixed door in anom lab 
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-06-22 16:09:09 +10:00
cib
f2313852d7 Added admin reporting. 2012-06-22 07:01:03 -07:00
cib
18d305341c Merge branch 'master' of github.com:Baystation12/Baystation12 2012-06-22 06:51:15 -07:00
cib
bbf735a00b Moderators can now identify antagonists. 2012-06-22 04:46:05 -07:00
caelaislinn
3210012cf9 slight artifact tweaks 
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-06-22 14:31:15 +10:00
caelaislinn
c1561be2f8 readded missing file. somehow it unticked during a merge and didn't get pushed? 
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-06-22 14:22:13 +10:00
SkyMarshal
dba2b81756 Fix for cael's derp. MAKE SURE YOU TICK YER FILES. 2012-06-21 18:10:15 -07:00
caelaislinn
c6ae41d7dc slight bugfixes 
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-06-22 07:26:14 +10:00
caelaislinn
124a511de1 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-06-22 07:16:43 +10:00
Hawk-v3
7abb3d8244 Merge pull request #1340 from SkyMarshal/BugFixes 
UltraLight optimizations, removes derpy footprint code for now, moves access levels into #defines.
 2012-06-21 14:09:14 -07:00
caelaislinn
fd0a501eff added new ore type which you can mine for artifacts, added new tool specifically for mining artifacts 
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-06-22 07:03:28 +10:00
caelaislinn
854ca4c516 ported much of alfie's anomaly code from luna, cut down and bugfixed much of said code, added new findable artifacts, tweaked existing artifacts, added anomalous artifact analysis (more to come later, possibly) 
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-06-22 07:02:56 +10:00
SkyMarshal
730461840f UltraLight optimizations, and moving of access levels into a defines. (Pre-processor stuff is fun) 2012-06-21 13:35:34 -07:00
SkyMarshal
f39676cacb Removes the unfortunately derpy bloody footprints. 2012-06-21 11:10:05 -07:00
Miniature
938a24d5a9 Merge pull request #1338 from Miniature/master 
Commented out a bunch of reaction checks that never result in any reactions.
 2012-06-21 09:54:42 -07:00
Miniature
489999d8b7 Commented out a bunch of reaction checks that happened when reagents only decreased in volume, since there's no reactions that require less than a certain amount of reagent, and none that add new reagents when they decay (and that should be done with add_reagents, which does check for reactions anyway) 2012-06-22 02:21:19 +09:30
SkyMarshal
5ea83f0abe Air alarm fixes, final part. Added in area atmos lockdown, proper overrides from the atmos control computer, cycling airlocks, and minor airflow/ZAS tweaks. 2012-06-21 02:06:05 -07:00
SkyMarshal
94cd09fe4c Merge pull request #1328 from Miniature/master 
Made capwhatever not do damage to soghun
 2012-06-21 02:05:09 -07:00
Albert Iordache
c3a65e0afc Cleaned up lighting.dm and boosted tube light a little. 2012-06-20 23:39:24 +03:00
Albert Iordache
2b9f6db9ce Merge branch 'master' of github.com:Baystation12/Baystation12 2012-06-20 23:38:34 +03:00
Hawk-v3
37c0132f35 Abi's request 2012-06-20 13:05:06 +01:00
Hawk-v3
631330a7f4 Upping the upload limit for sound files. 2012-06-20 12:41:14 +01:00
Miniature
79ad52d64d Merge branch 'master' of github.com:Baystation12/Baystation12 2012-06-20 20:28:06 +09:30
Albert Iordache
8d9671a1e7 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-06-20 11:02:59 +03:00
SkyMarshal
ef3e93652c Fixes for Antiqua compilation and runtimes. 2012-06-19 21:37:41 -07:00
SkyMarshal
abe222afde Fixed botpathing. Some fixes/changes to glows. Made lights less piss yellow. 2012-06-19 20:52:01 -07:00
Erthilo
edd6f3ad88 Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates 
Conflicts:
	code/game/machinery/doors/airlock.dm
	code/game/machinery/doors/door.dm
	code/game/objects/transfer_valve.dm
	code/game/turf.dm
	code/modules/clothing/gloves.dm
	maps/tgstation.2.0.8.dmm
 2012-06-19 22:09:30 +01:00