cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-17 21:53:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,588 Commits 9 Branches 0 Tags
c5301c51449fd2ac3cb0d951a201390d62ed00b0
Commit Graph

8886 Commits

Author SHA1 Message Date
d_h2005@yahoo.com
68969baa5c Fixes issue 1106 - Splits the chicken suit into suit and hat. Adds an egg to the costume landmark for honks and giggles. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5359 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-12-19 06:36:12 +00:00
giacomand@gmail.com
7b3ca4e0d9 Reverted r5355. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5357 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-12-18 23:51:10 +00:00
ericgfwong@hotmail.com
4ca1f32713 Increased the probability of tricord's effectiveness from 40% to 80% 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5356 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-12-18 21:05:20 +00:00
giacomand@gmail.com
452a241251 -Summoning Nar-Sie will be the only objective of cultists. 
-You can only summon Nar-Sie on the station Z level. Added more text to explain this.

This commit has been approved by the people of coderbus.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5355 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-12-18 20:31:55 +00:00
cib
f769bcffb3 Fixed an indentation error. 2012-12-18 18:40:55 +01:00
cib
9427c963cb Spacesuits and helmets now protect from pressure. 
Don't want to know why they didn't before.
 2012-12-18 18:36:54 +01:00
cib
9a6cc83f48 Made the cleaver be a sharp weapon, so you can decapicate with it. 2012-12-18 18:10:28 +01:00
cib
85ec5157fe Forced antags are now logged to admins. 
This might help tell bugs from simply no one having chosen the role.
 2012-12-18 17:25:14 +01:00
Hawk-v3
7c43c3d1a6 Merge pull request #2082 from Zuhayr/master 
Fix for stun baton throwing message.
 2012-12-18 08:13:45 -08:00
Zuhayr
24473bdd19 A small fix to the throwing string when a mob is struck with a baton. 2012-12-19 01:57:47 -08:00
cib
59ed460c65 Fix a compile error. 2012-12-18 15:56:24 +01:00
RavingManiac
1b756b9fe5 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-12-18 22:01:51 +08:00
Jim "Apples"
70a82fcde6 Merge pull request #2080 from Zuhayr/master 
Oen'g's baton (Custom item)
 2012-12-18 05:14:23 -08:00
Zuhayr
d59b160f80 Oen'g's baton. 2012-12-19 00:13:19 -08:00
cib
455b0a7c3b Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into feature 
Conflicts:
	code/game/gamemodes/events.dm
 2012-12-18 14:08:41 +01:00
Hawk-v3
79b9285889 Merge pull request #2076 from GauHelldragon/master 
Telecomm Server circuit label fix
 2012-12-18 04:40:43 -08:00
ericgfwong@hotmail.com
beaf10ed6a Medibots now only use Tricordrazine and Spaceacillin for all their treatment-related activities. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5353 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-12-18 04:22:26 +00:00
ericgfwong@hotmail.com
d8230cbd18 Updated DJ Station instructions 
Re-added Old Note
A few more changes to the old assembly line to make it more convincingly derelict.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5352 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-12-18 02:25:16 +00:00
RavingManiac
67bbd9bf2b Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-12-17 21:11:03 +08:00
ericgfwong@hotmail.com
b76c8fd4f0 Changed Mulebot access to Cargo Tech and removed its robotics access. 
Changed floorbots' req_access to access_construction so both atmos and engineers can use it.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5346 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-12-17 06:15:56 +00:00
GauHelldragon
d38a0715e7 Fixed design name of telecomm circuit design 
Was mislabeled, fixed!
 2012-12-16 17:41:24 -08:00
petethegoat@gmail.com
c8efd1e59b Updated the map with fixed incinerator doors that use the new heat_proof var. 
Added a few film canisters to art storage and the dorms.
Fixed a misplaced wall in R&D.

Added a new carpet icon_state, so the dorms don't have to look stupid.

Added a new option for key auth devices, it removes the maint access requirement from all doors.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5345 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-12-16 20:52:29 +00:00
giacomand@gmail.com
eca72b69aa -Added constructable solar arrays. 
-Added a solar pack crate to order.
-Machines that have a use_power of 0 will no longer be turned off due to lack of power in the area.
-Fixed a bug with the solar computer not reconnecting to the powernet when dismantled and remantled.
-Increased the cap of crates to 30.
-Some performance tweaks.
-Some standardization.
-All objects of type /obj/machinery/power will try to disconnect from the powernet before deleting, this will help reduce the node list size.
-Added a heat_proof variable for doors. It will effect glass airlocks and it'll determine whether they can block heat or not. Research glass airlocks will always have it enabled.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5344 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-12-16 19:51:23 +00:00
ericgfwong@hotmail.com
41e3f7bf64 -Added fire extinguishers to xeno and viro 
-Added lights to singularity containment
-Engineering lockers now use Power Equipment access
-Expanded Tox Storage access to include the Tox lab, making it a separate access like Xenobiology

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5343 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-12-16 19:10:45 +00:00
Jim "Apples"
11427734c3 Merge pull request #2073 from CIB/bugfix 
Make setblock able to handle block index 0
 2012-12-16 09:23:25 -08:00
cib
5360915221 Fixes issue #2032 
The proc to get zlevel map files used lowertext on the filename. That is bad, for obvious reasons(breaks uppercase paths on linux).
 2012-12-16 18:16:21 +01:00
cib
8512bdd8d7 Make setblock able to handle block index 0 
It will simply do nothing. Fixes issue #2049
 2012-12-16 17:45:20 +01:00
cib
ebb8a73ee3 Derp in previous commit. 
Whoops. :(
 2012-12-16 16:37:38 +01:00
cib
8355d498c7 Adjusted event chance config to new event system. 
With events adjusted to departments, events should happen a bit more often.
 2012-12-16 16:19:55 +01:00
cib
847c1efd0f Fixed a problem with events probability. 
I multiplied with "percent" chances, without dividing by 100. Would lead to permanently 100% chance of anything.
 2012-12-16 16:16:21 +01:00
cib
d94faea360 Event system now takes department activity into account. 
Pretty much an overhaul of the whole event choosing system, which makes it a bit better IMO. Ported this from my larger feature request branch.
 2012-12-16 15:15:18 +01:00
cib
d0735e9a87 Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into feature 
Conflicts:
	code/ZAS/ZAS_Zones.dm
	code/game/gamemodes/events.dm
 2012-12-16 15:10:04 +01:00
RavingManiac
f9502a0143 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-12-16 22:08:37 +08:00
RavingManiac
1418697000 wrapsortjunction fixed - will now divert packages correctly. 
Mail chute changed a bit, as ejected packages were smashing the window door.

"Small parcel" renamed to "Parcel".
 2012-12-16 22:07:22 +08:00
cib
933e53aa98 Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into minor_feature 
Conflicts:
	code/game/gamemodes/events.dm
 2012-12-16 15:02:54 +01:00
cib
679c715482 Merge branch 'master' of github.com:Baystation12/Baystation12 into minor_feature 2012-12-16 14:57:54 +01:00
Hawk-v3
9ed0e80acf Merge pull request #2058 from GauHelldragon/master 
Portable Generator Fix
 2012-12-16 05:55:56 -08:00
RavingManiac
605f981ce9 Revert ""Hidden" HE pipes added. HE piping in the kitchen cold room allows a freezer unit just outside the cold room to lower the room's temperature. A human inside the cold room with the temperature set to minimum will typically expire within a few minutes." 
This reverts commit e924aa8fc3.
 2012-12-16 20:07:30 +08:00
Zuhayr
45527ec599 Four custom items plus config.txt. 2012-12-16 00:40:04 -08:00
d_h2005@yahoo.com
67bab3b87f Small bugfix for extract reactions. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5340 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-12-16 04:17:54 +00:00
cib
7cf3244316 Fixes issue #2059 
Mob transform into monkey no longer uses hardcoded DNA size of 14.
 2012-12-16 04:57:32 +01:00
d_h2005@yahoo.com
5b10f935a3 Adds a blocked list to slime extract critter reactions, currently stocked with the "human" simple_animals - as that causes roleplay problems especially regarding the AI - and the station-eating large xeno queen boss. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5339 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-12-16 03:54:10 +00:00
cib
a6d5a6a26e Removed yet another type of gib that looks like a head. 
Just how many heads does a person have, according to this code?
 2012-12-16 04:40:19 +01:00
baloh.matevz
43ee6cf5d2 - Added the ability to have multiple choice player polls. 
- Added two new verbs to 'debug verbs'. The first outputs everything in the jobban records list to standard output, the 2nd applies a filter and only prints the things that contain the word.
- Fixed an old jobban bug which only checked if someone's ckey ends with the bannee's ckey to jobban them from the job. So perrorage getting banned would result in errorage having the ban in effect too.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5338 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-12-16 03:29:06 +00:00
cib
cc2057240a Fixed two compile errors. 2012-12-16 04:23:57 +01:00
cib
49958de6aa Removed loyalty implants from all security except the HoS. 
See http://baystation12.net/forums/viewtopic.php?f=5&t=6318
 2012-12-16 04:11:55 +01:00
cib
0855c5d1af Fixes issue #2006 
Medical belt can now hold autoinjector.
 2012-12-16 04:04:43 +01:00
cib
16a31a0cc3 Fixes issue #2053 
Shuttle doors now close just before the shuttle leaves.
 2012-12-16 03:59:32 +01:00
cib
caf56c4c7d Merge branch 'bugfix' into minor_feature 2012-12-16 03:41:32 +01:00
cib
a6d1a666a9 Merge branch 'bugfix' into feature 
Conflicts:
	code/game/gamemodes/events.dm
 2012-12-16 03:41:11 +01:00