cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-16 13:13:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,093 Commits 6 Branches 0 Tags
dd94adc76576ff16bc51e9bc623eb89686f467e6
Commit Graph

11210 Commits

Author SHA1 Message Date
Ccomp5950
dd94adc765 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into investigate_fix 2013-12-05 04:42:28 -06: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
DJSnapshot
ad4782babe Merge pull request #4025 from nightexcessive/bugfix/ai-apc 
Fixes #2355
 2013-12-03 21:46:23 -08:00
Ccomp5950
94f8ccfddd Bugfix: AI no longer dies if touching the supermatter, using attack_ai instead of a isAI() check. 2013-12-03 18:50:19 -06:00
Ccomp5950
254bba5e1a Bugfix: AI's will no longer disintegrate if they click the supermatter. 
While hilarious this is a terrible bug.
 2013-12-03 17:24:29 -06:00
Michael Johnson
65d62026b0 Fixes #2355 2013-12-03 13:53:52 -05:00
Ccomp5950
624068cc4f Emergency Insertion - Supermatter Manual. 
/obj/item/weapon/book/manual/supermatter_engine
 2013-12-01 19:31:25 -06:00
Mloc
fc9dc8243e Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 2013-12-01 21:42:23 +00:00
Mloc
b682e9ace0 Merge pull request #3998 from DJSnapshot/hotfix 
bugfixes!
 2013-11-30 15:26:14 -08:00
DJSnapshot
2203309fcc Merge pull request #4006 from Baystation12/master 
merge master into dev-freeze
 2013-11-30 15:22:31 -08:00
Chinsky
9437241425 Merge pull request #3995 from Ccomp5950/dionaea_jobban 
Admin request:  Added ability to jobban players from becoming Dionaea nymphs
 2013-11-29 23:00:26 -08:00
DJSnapshot
00ecbcdcfd fix for https://github.com/Baystation12/Baystation12/issues/3887 
Thanks to AquaDraco for the fix
 2013-11-29 17:44:31 -08:00
Chinsky
e698c842a7 Merge pull request #3994 from Ccomp5950/exosuit_handcuffs 
Players will now no longer be able to jump in exosuits while handcuffed.
 2013-11-29 17:33:00 -08:00
Chinsky
027b0d8ec6 Merge branch 'master' into dev-freeze 
Conflicts:
	html/changelog.html
 2013-11-30 05:16:49 +04:00
Chinsky
b4baf60414 Merge pull request #3989 from Ccomp5950/syndicate_id_fix 
Hotfix for Syndicate ID's not being able to be assigned names / job
 2013-11-29 17:05:16 -08:00
Chinsky
434283d90a Merge pull request #3990 from Ccomp5950/tatorpanel 
Bugfix for new traitor panel.
 2013-11-29 16:50:41 -08:00
Ccomp5950
675f46fb80 Oops, Typo. What a difference that exclamation point can make. 2013-11-29 15:26:45 -06:00
Ccomp5950
05492cc921 Created a check to see if there is a registered user of the syndicate card, 
if there isn't it assignes the first person who tries to change their name with it as the registered user.
 2013-11-29 15:07:39 -06:00
Ccomp5950
3be474bab8 Admin request: Added ability to jobban players from becoming Dionaea nymph 2013-11-28 22:35:12 -06:00
Ccomp5950
a8738ddc4b Players will now no longer be able to jump in exosuits while handcuffed. 2013-11-28 21:35:04 -06:00
Ccomp5950
287860b377 Force name update on new() of syndicate ID cards 
Will make sure there is no null names making players unclickable as well as making syndicate cards work
 2013-11-28 20:52:38 -06:00
Ccomp5950
497c111796 Bugfix: Hyposprays now fit in medical belts. 
Problem:  Person fixing bug #2006 was a bit too specific about type of autoinjectors able to fit in belt.

Solution:  Be less specific.  Now hyposprays fit in belts.
 2013-11-28 19:25:43 -06:00
Ccomp5950
d367d6ca8a Bugfix for new traitor panel. 
Bad indention, very bad indentation!

And else was under the wrong IF and was causing the traitor options line to not show up.
 2013-11-28 19:05:48 -06:00
Ccomp5950
1f76f4cfd0 Hotfix for Syndicate ID's not being able to be assigned names / occupations. 2013-11-28 18:43:46 -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
Zuhayr
0935d7d7a6 Merge pull request #3977 from Ccomp5950/loyaltyimplant_fix 
Runtime fix:  Loyalty Implants, Monkeys, and Traitor Panels!
 2013-11-25 13:48:09 -08:00
Zuhayr
8b5664f321 Merge pull request #3975 from Ccomp5950/lasertag_suicide 
Can no longer commit suicide with a lasertag gun.
 2013-11-25 03:19:05 -08:00
DJSnapshot
950836c05b Merge pull request #3974 from Ccomp5950/demonblood_runtime 
Fixed a runtime issue with demonsblood.
 2013-11-24 16:21:37 -08:00
Ccomp5950
f7dd1b69aa Runtime fix: 
A traitor panel used on a player-monkey would runtime due to the loyalty implant fix.

We ignore loyalty implants in monkeys, monkeys don't even know what Nanotrasen is, the nanobots probably don't even know what to do with a monkey.
 2013-11-24 17:52:26 -06:00
Mloc
503302dae5 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze 
Conflicts:
	code/game/objects/items/weapons/implants/implant.dm
	code/modules/reagents/Chemistry-Machinery.dm
 2013-11-24 23:37:09 +00:00
Mloc
a2fdf79da4 Merge pull request #3972 from Zuhayr/master 
Fixes #3642
 2013-11-24 12:54:06 -08:00
Mloc
bebb826c2b Merge pull request #3970 from Ccomp5950/hud_fix 
Hud fix
 2013-11-24 06:45:06 -08:00
Mloc
74c6a35f9e Merge pull request #3969 from Ccomp5950/booze_fix 
Booze fix
 2013-11-24 06:44:04 -08:00
Ccomp5950
72b762db53 Can no longer commit suicide with a lasertag gun. 
And you will feel silly for even making the attempt.
 2013-11-23 21:51:15 -06:00
Ccomp5950
e684b69741 Fixed a runtime issue with demonsblood. Was causing runtimes because data was inheriting the bloods data var (which is a list). 
The drink will still maintain it's reagents and data vars but when ingested and procesed the blood is ignored.

Downsides, you can't get sick from ingesting blood in a drink (which..you shouldn't anywho)

Possible future updates:  since blood is an amnetic substance make the person have nausia for ingesting it if quantities are high
 2013-11-23 20:21:51 -06:00
Nanai
7a4f11990c Holostools/Stool Replacement 
Fixes issue #3323
Adds in a holostool item, replaces all holodeck stools.
 2013-11-23 19:22:05 -05:00
Nanai
a8f1ee6c91 Girder health/laserkill fix 
Allows girders to be broken by repeated laser shots to stop abuse against laserfire. Also, for actually being able to lase through walls if they're open.

Resolves issue #3796
 2013-11-23 18:50:15 -05:00
Zuhayr
185c83b287 Fixes #3642 2013-11-24 09:22:50 +10:30
Zuhayr
dc90ab9eb4 Merge pull request #3964 from Ccomp5950/atmostech_access 
Bugfix:  Atmospherics technicians will now have external_airlock access
 2013-11-23 14:47:50 -08:00
Mloc
c5cd3562e3 Merge pull request #3961 from Ccomp5950/loyaltyimplant_fix 
Bugfix(2126) Traitors still have loyalty implants, admins should be able to remove/disable implants
 2013-11-23 04:02:40 -08:00
Nanai
5484163efe Implant mode changability, explosive variable fix 
Fixed and upgraded as per Ravensdale's request in #3966
 2013-11-23 06:55:12 -05:00
Ccomp5950
9e4e46cf44 Removed soda items from Booze dispenser 2013-11-23 04:49:02 -06:00
Ccomp5950
3b2767cb35 Hud icons will now also update with their usual icons and states 2013-11-23 04:43:45 -06:00
Zuhayr
471c45471e Fixes #3927 2013-11-23 21:08:52 +10:30
Zuhayr
b476a55b47 Fixes #3967 2013-11-23 20:52:39 +10:30
Zuhayr
bfc5a61da1 Fixes #3966 2013-11-23 20:33:58 +10:30
Ccomp5950
317c562039 Fixed the HUD icons in upper left to show up now. 
_onclick changes had removed the proc for this.
 2013-11-23 03:26:57 -06:00
Nanai
89200e16b7 Computer Update Proc Fix 
Fixes issue #2486
Resolves atmos computers not updating, adds an update proc to printing.
 2013-11-23 03:28:00 -05:00
Ccomp5950
df7c877da7 Space Soda should now show up in the Soda Dispenser 2013-11-23 02:02:14 -06:00
Ccomp5950
3a177a95c4 And fix so Space Cola shows up too. 2013-11-23 01:50:17 -06:00