cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,540 Commits 5 Branches 0 Tags
914a9079f0ff70f1528b85458dfc467a2f5079ec
Commit Graph

9539 Commits

Author SHA1 Message Date
cib
914a9079f0 Added serithi's soundbits as mode sound announcements. 2013-05-19 05:56:18 +02:00
cib
fc20393b60 Merge branch 'master' of github.com:Baystation12/Baystation12 into feature 
Conflicts:
	baystation12.dme
 2013-05-19 05:54:14 +02:00
MagmaRam
d7876da147 Merge branch 'master' of https://github.com/Baystation12/Baystation12 
Conflicts:
	icons/obj/custom_items.dmi
 2013-05-19 06:21:32 +07:00
cib
8cfc395232 Added community-made newsfeeds. 
Yay!
 2013-05-18 23:20:20 +02:00
cib
670bf5bb76 Radiation storms consider maintenance now. 
Also, a fix to spray(whoops!)
 2013-05-18 22:18:37 +02:00
cib
d7cc42e588 Added wallrot event. 
Also some updates to changelog.
 2013-05-18 21:55:02 +02:00
cib
38cdb4d4f5 Most mobs can emote now. 
Also added CSS to say, so that you can tell apart "say" and "me say"
 2013-05-18 18:17:28 +02:00
MagmaRam
fbfa125f4b Bugfix: Fixed issues with custom item camera sprites 
icond/obj/custom_items.dmi: renamed off sprite for blue camera

code/modules/paperwork/photography.dm: made cameras use variables item_on and item_off for sprites so that other types of cameras (i.e. custom ones) can use their own sprites without getting messed.

/code/modules/customitems/item_defines.dm: set sprites for custom cameras "orange camera" and "old camera" to use item_on and item_off sprites in custom_items.dmi so that they had the correct sprites
 2013-05-18 22:00:15 +07:00
Chinsky
6c062dc05c Merge pull request #2793 from meyar/master 
Fixin' the traitor ID
 2013-05-18 06:11:46 -07:00
meyar
cd5f0885ff Adds ERT radio 
Makes the ERT frequency accessable
 2013-05-18 09:06:36 -04:00
faux
6e85a3ed42 Master Bug Fixes 
- Fixes wall under maintenance tunnel door.
- Fixes AAAAHHHHHHHRRG psych office pressure issue.
- Fixes some names and DMIs on some items. (in theory)
 2013-05-18 05:57:21 -07:00
cib
22ea35cb8f Added command reports to RP rev. 2013-05-18 14:18:11 +02:00
fauxtada
e932ac76b1 Merge branch 'master' of https://github.com/Baystation12/Baystation12 
Conflicts:
	code/game/objects/structures/crates_lockers/closets/secure/security.dm
	code/modules/clothing/under/miscellaneous.dm
	icons/mob/uniform.dmi
	icons/obj/clothing/uniforms.dmi
	icons/obj/custom_items.dmi
	maps/tgstation.2.1.0.0.1.dmm
 2013-05-18 04:56:40 -07:00
cib
c1cefa4a80 Added more debug logging to events. 2013-05-18 13:49:45 +02:00
cib
e2249fa177 Added organ damage random medical event. 
It doesn't make a lot of sense, but who cares about that!
 2013-05-18 13:48:57 +02:00
cib
90076f017a Added debug logging for events. 
Something's just not right about events still.
 2013-05-18 13:17:19 +02:00
cib
335565cba7 Made RP rev use a different news story. 2013-05-18 13:10:07 +02:00
cib
be197afc77 Added system for newscaster events. 
This way people can write stories, separated into several pieces, which will be announced through the newscasters over the course of the round.
 2013-05-18 13:06:16 +02:00
meyar
c170f57ba7 Returns lost functionality to the traitor ID, letting a traitor re-forge their ID more than once. 2013-05-18 06:48:01 -04:00
cib
e4b610207b Make debug log accessible to mods and coders. 2013-05-18 11:34:00 +02:00
cib
48b78ea758 Re-added latespawn. 
Used in autotraitor and RP-revolution.
 2013-05-18 11:06:19 +02:00
cib
0da9a4538e New debug log system. 
You can as admin toggle debug messages, VERY useful for devs and debugging the main server.
 2013-05-18 10:02:37 +02:00
Mordeth221
09a41d83cc New less obnoxious vote noise 2013-05-17 17:44:39 +02:00
Mordeth221
a6c995e321 New less obnoxious vote noise 
And everyone will love this noise too!
 2013-05-17 11:02:31 +02:00
Chinsky
5f8b7db6bd Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-05-17 07:35:21 +04:00
Chinsky
7b723bfb82 Merge pull request #2762 from Baystation12/bleeding-edge-freeze 
BEF merge [waitabit]
 2013-05-16 18:30:10 -07:00
Chinsky
25fe7aab07 Merge pull request #2779 from Jamini/master 
Disposals Fix
 2013-05-16 18:29:19 -07:00
Jamini
5b14c5081c Adjustment 
Signed-off-by: Jamini <mobiousjami@gmail.com>
 2013-05-16 21:26:26 -04:00
Chinsky
0e7b803d8e Merge pull request #2761 from havocx42/master 
Removing reverselist() from all bot pathing.
 2013-05-16 18:20:27 -07:00
Jamini
d2c9f11b4f Fixed a disposals bug. Playing with the big garbage pipes is now stupid again. 
Signed-off-by: Jamini <mobiousjami@gmail.com>
 2013-05-16 21:10:03 -04:00
SkyMarshal
5884f24f6a Adjusting air alarm settings. 
"Scrubbing" is the default mode
"Panic" empties the room
"Fill" turns off the scrubbers and activates the vents in an effort to replace lost air
"Cycle" will trigger first a panic siphon then a fill mode in order to empty a room of contaminants before refilling it from the supply pipes
"Replacement" will turn on the panic siphon while continuing to add air into the room
"Off" will disable all attached devices. (This is useful for breached areas)
 2013-05-16 17:29:58 -07:00
Chinsky
ee374d69c0 Merge pull request #2774 from Roaper/master 
Hey Hey Hey! got it to work! Look at me now mah!
 2013-05-16 10:46:04 -07:00
Mloc
98a12ad82b Fixed up BrokenInHands a little. 
Signed-off-by: Mloc <colmohici@gmail.com>
 2013-05-16 13:05:23 +01:00
Mloc
5faabba7fb Merge branch 'master' into bleeding-edge-freeze 
Conflicts:
	html/changelog.html

Signed-off-by: Mloc <colmohici@gmail.com>
 2013-05-16 12:21:55 +01:00
Mloc
566454b4c2 gave debuggers proccall back 2013-05-16 12:35:59 +02:00
Ian O'Malley
5039828944 4th times the charm. 
Added some stuff onto code/modules/events/money_spam.dm
Added some stuff onto code/modules/flufftext/Dreaming.dm

Signed-off-by: Ian O'Malley <roaperable@gmail.com>
 2013-05-15 15:55:58 -07:00
Chinsky
4f35f581c0 Merge pull request #2768 from SkyMarshal/bleeding-edge-freeze 
Air alarm fix, atmos control computer fix, item description fix.
 2013-05-15 14:37:07 -07:00
SkyMarshal
6e2879dc74 Made an oopsie 2013-05-15 14:36:32 -07:00
SkyMarshal
88a65b63e4 Fixes air alarms going off if the upper bounds were set to disabled. 
Fixes atmos control computer displaying some air alarms in unreadable yellow
Fixes a text error in item descriptions.
 2013-05-15 14:31:31 -07:00
Mloc
e0f22c9931 Turn off control_freak for profiling and stuff. 2013-05-15 22:52:25 +02:00
Mloc
5b177df027 Merge pull request #2766 from SkyMarshal/bleeding-edge-freeze 
Fixes air alarms freezing station an hour into round.
 2013-05-15 13:29:15 -07:00
SkyMarshal
a1bc5d6cf0 Fixes air alarms freezing station an hour into round. 2013-05-15 13:28:27 -07:00
Spamcat
0fb651e873 Fixed glasses 
Fixes #2742
 2013-05-16 00:11:57 +04:00
Chinsky
917ce079ab Merge pull request #2763 from fauxki/bleeding-edge-freeze 
Quick Fixes - BEF
 2013-05-15 11:35:15 -07:00
fauxtada
2b9130b00f Quick Fixes 
- Changed access to security washroom so detective can go in.
- Removed wall that was under maintence tunnel door.
- Fixed writerer's custom item. AGAIN. .. Because they can't decide what character they want it on.
- Added saloon dress to bar closet.
 2013-05-15 11:26:26 -07:00
Chinsky
15b00b733d Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-05-15 20:13:35 +04:00
Laurence Reading
374e950a32 Removing reverselist() from all bot pathing 
As with my previous commit, reverselist() is causing problems in bot
pathing, it is unnecessary. Bot pathing only worked when reverselist()
was doing nothing.
 2013-05-15 16:50:24 +01:00
Laurence Reading
8230214833 Fixed MULEbot pathing 
MULEbot was simply reversing the path before trying to follow it, Also
added a null check.
 2013-05-15 10:34:09 +01:00
Mloc
345c2b1f3c Merge pull request #2752 from CIB/feature 
Improved the command report
 2013-05-14 12:24:09 -07:00
cib
bb06a18c33 Reduced chance for changeling to be listed as suspect. 
Better than discussing this forever.
 2013-05-14 21:12:47 +02:00