cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-16 21:23:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,064 Commits 6 Branches 0 Tags
f1b77d0ed67cbc5097f0b51fee94b7f0538ebfd9
Commit Graph

6854 Commits

Author SHA1 Message Date
Ccomp5950
570c98f0e2 Runtime fix: N00k agents on spawn were causing a runtime here. 2013-12-07 05:18:27 -06:00
Ccomp5950
4cb9cd0911 Teleport bug fix 
Since we're unable to reproduce this bug in a testing environment and I've already concluded this isn't a telescience bug then I am leaning more towards Xenoarchiology, specifically the artifacts.

This sanity check basically makes it where if there is an artifact on null terf or inside a container it won't process the effect.
If it's the teleport effect of artifacts that is causing this to happen and it's based on the item being in nullspace somehow then it should squash the bug.
Though the root of this is probably #4037 I cannot reproduce the runtime either.

So here goes, a stab in the dark.
 2013-12-07 00:18:40 -06:00
Chinsky
828bd55c09 Merge pull request #4036 from Ccomp5950/telesci_fix 
Telescience bugfixes
 2013-12-06 16:56:46 -08:00
Ccomp5950
f7d0d95775 Removed useless sanity check. 
I debugged telesci with a proc that fires the teleport but bypasses all sanity checks and sets target = locate(0,0,0) or null
neither case caused the teleport bugs we are seeing
 2013-12-06 06:03:21 -06:00
Ccomp5950
9a6b4c6a0d Telescience bugfixes 
UI will now update when clicking on stuffs

Added a sanity check to make sure the teleport location isn't 0 or null on all 3 coordinates.
Not sure if this will plug up the random teleporting bug but it can't hurt to have this in there.
 2013-12-06 04:48:02 -06:00
Ccomp5950
0850c30d37 Become Mouse now has a confirmation window. 
Squeek!  Now people can quit complaining about hitting it by accident.
 2013-12-05 20:29:38 -06:00
Zuhayr
78f6c478e7 Merge pull request #4031 from Ccomp5950/investigate_fix 
Added Telesci to the investigate list.
 2013-12-05 03:00:33 -08:00
Zuhayr
b3c0079e18 Merge pull request #4004 from volas/master 
Minor fixes
 2013-12-05 02:56:06 -08:00
Ccomp5950
dd94adc765 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into investigate_fix 2013-12-05 04:42:28 -06:00
Zuhayr
edabf18323 Merge pull request #4012 from N3X15/dna2 
DNA2 - A recode of DNA
 2013-12-05 02:39:55 -08:00
Ccomp5950
157b67404c Added Telesci to the investigate list. 
Admins will now be able to select it and view who used the telescience machines
 2013-12-05 04:21:18 -06:00
Chinsky
9938c152ff Merge pull request #4023 from Zuhayr/feature 
Ability skeleton code, basic cryopod functionality.
 2013-12-04 13:50:17 -08:00
Kilakk
d2c07184f7 Merge remote-tracking branch 'upstream/dev' into dev-radio 
Conflicts:
	maps/tgstation2.dmm
 2013-12-03 21:24:03 -05:00
Zuhayr
46379c5a16 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev-freeze 2013-12-04 12:36:05 +10:30
Zuhayr
5c1415f3b8 Removed some commented ability code. 2013-12-04 12:30:37 +10:30
Michael Johnson
65d62026b0 Fixes #2355 2013-12-03 13:53:52 -05:00
Chinsky
bcd15162be Merge pull request #4024 from comma/dev 
Master -> Dev
 2013-12-03 07:43:11 -08:00
Chinsky
0074452f29 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2013-12-03 19:42:17 +04:00
Zuhayr
74fe8cd76a Somehow managed to break this during merge resolution. 2013-12-03 22:42:22 +10:30
Zuhayr
5e3857ff38 Compile fix for global ability list. 2013-12-03 03:36:10 +10:30
Zuhayr
69d84931e6 Changelog merge resolution. 2013-12-03 01:07:17 +10:30
Kilakk
13abdf9fdc Moved the CentComm channels onto their own tcomm network thing 
* 144.1 and 144.3 are accessible through regular headsets, silly people were using them to listen in on response teams
* Moved the ERT and Deathsquid channels to 134.5 and 134.1 respectively
* Created presets for a tcomms setup on the CentComm zlevel
 2013-12-01 18:58:16 -05:00
Kilakk
f6fff10908 Added burning paper with lighters 
* why not?
* Now with 150% more noir
 2013-12-01 17:26:33 -05:00
Rob Nelson
53c2aff420 DNA2 - A recode of DNA 
DNA now stores blocks internally as numbers and only makes the uni_identity and struc_enzymes strings when something has changed. This is vastly more efficient.

In addition, the API for using it has been simplified. Common tasks, such as setting a sub-block, or getting a value from the block, are handled entirely by the DNA datum with simple, easy-to-use procs.

Tested on local server, but may need balancing and additional look-over since the code is from our server (/vg/) and I likely broke or forgot something.
 2013-12-01 00:04:27 -08:00
Zuhayr
e90fd95a22 Merge resolution. 2013-12-01 15:19:29 +10:30
Zuhayr
4ea738c8b5 Merge pull request #3996 from comma/dev 
Fixed issue with chopped off heads not having hair icons.
 2013-11-30 20:46:04 -08:00
Zuhayr
19c41e3d75 Commenting out test ability stuff. 2013-12-01 15:12:11 +10:30
DJSnapshot
2203309fcc Merge pull request #4006 from Baystation12/master 
merge master into dev-freeze
 2013-11-30 15:22:31 -08:00
volas
e05b7f4341 brainmob fix: decapitated head is now really dead 2013-11-30 15:45:53 +04:00
volas
6841906228 Custom UI 2013-11-30 15:10:42 +04:00
Ccomp5950
0040a91b23 Ghost MedicHUD now actually checks for viruses. 
Thanks Chinsky for the tip!
 2013-11-30 01:56:13 -06:00
Ccomp5950
d039bea124 Ghostbuff, round 2. MedicalHUD 
Ghosts can now toggle a medical HUD
 2013-11-30 00:00:56 -06:00
Chinsky
027b0d8ec6 Merge branch 'master' into dev-freeze 
Conflicts:
	html/changelog.html
 2013-11-30 05:16:49 +04:00
Chinsky
5b168c8e4b Merge branch 'dev-freeze' into dev 
Conflicts:
	icons/obj/ammo.dmi
 2013-11-30 05:15:22 +04:00
Chinsky
3e52d581a7 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2013-11-30 05:12:06 +04:00
Chinsky
5d3e712d64 Merge branch 'master' into dev-freeze 
Conflicts:
	html/changelog.html
 2013-11-30 05:11:36 +04:00
Zuhayr
367cc3a827 Added skeleton code for mob abilities. 2013-11-30 00:02:05 +10:30
Chinsky
ca649d95aa Fixed issue with chopped off heads not having hair icons. 
Also threw in some eyecandy, limbs now turn at random angle (70 - 130) instead of straight 90.
 2013-11-29 16:13:45 +04:00
Zuhayr
d80edab619 Merge resolution. God damn the changelog. 2013-11-29 22:39:33 +10:30
Zuhayr
794ca4064e Merge resolution. 2013-11-29 22:36:36 +10:30
Zuhayr
9c4b4c2817 Merge resolution. 2013-11-29 22:34:09 +10:30
Mloc
f1672e2de0 Merge pull request #3987 from MrLeebo/dev 
Thanksgiving Update: Tofurkey!
 2013-11-29 03:10:10 -08:00
Ccomp5950
3be474bab8 Admin request: Added ability to jobban players from becoming Dionaea nymph 2013-11-28 22:35:12 -06:00
Iamgoofball
e02566fd2f Changes Telescience to Projectile Trajectory! 
Conflicts:
	code/modules/telesci/gps.dm
	code/modules/telesci/telesci_computer.dm
 2013-11-28 17:50:09 +04:00
Chinsky
6b23a0d7c0 Merge pull request #3982 from Mloc/bs12-hooks 
Implements hooks, an easier way to write code to be called at startup/roundstart/roundend/etc.
 2013-11-28 05:32:08 -08:00
Jeremy Liberman
6afa23a62e Adds tofurkey and stuffing food items 2013-11-28 03:45:13 -06:00
Chinsky
845a995abe Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 
Conflicts:
	icons/mob/uniform.dmi
 2013-11-27 04:12:42 +04:00
Chinsky
83d1924b83 Commiting SueTheCake's detective things. 
-New set of clothes spawning in the closet.
-Replacement of revolver by semiauto gun, with update to autolathe recipies.
 2013-11-27 04:10:06 +04:00
Zuhayr
aa6744344a Merge pull request #3976 from Ccomp5950/custom_items_buggaloo 
Custom Items.
 2013-11-25 13:47:43 -08:00
Mloc-Argent
6095a3a249 Merge branch 'dev' of github.com:Baystation12/Baystation12 into bs12-hooks 2013-11-25 21:17:07 +00:00