cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,659 Commits 10 Branches 0 Tags
c78f47c7954ace18cc11bb5a7d9845c8d355b93a
Commit Graph

5384 Commits

Author SHA1 Message Date
Chinsky
c78f47c795 Merge branch 'bleeding-edge-freeze' into tentacles 2013-05-26 05:02:34 +04:00
Chinsky
13e2d8d793 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 
Conflicts:
	html/changelog.html
 2013-05-26 05:02:07 +04:00
Chinsky
76525a4ccf Merge pull request #2852 from VitrescentTortoise/bleeding-edge-freeze 
Changeling husk names now 'Unknown'
 2013-05-25 16:03:24 -07:00
VitrescentTortoise
827e85c4c3 Properly sets husks' names to unknown 2013-05-25 16:00:22 -07:00
cib
a764c226f8 Implemented a system to avoid the same event happening too often. 
Also bumped event frequency, this shouldn't be as bad with the same event not repeating itself that often.
 2013-05-26 00:12:59 +02:00
Erthilo
e2ea94d59c Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-05-25 22:16:29 +01:00
Erthilo
4028172c98 Fixes mutantrace languages appearing as unknown for observers and also appearing as says rather than race specific word. 2013-05-25 22:09:41 +01:00
Erthilo
c2b84e0985 Fixes mutantraces (soghun, skrell, tajaran) losing languages when cloned. 2013-05-25 22:08:57 +01:00
VitrescentTortoise
afb49c05d9 Fixed lemonjuice showing up as ..what? 2013-05-25 12:52:56 -07:00
Chinsky
e197799c46 Fixes #2830 
Applied Walter0o's fix to silicon namepicking locking up job spawn on roundstart.
 2013-05-25 13:34:24 +04:00
Jim "Apples"
858d98eb7c Merge pull request #2816 from comma/HTML 
HTML in papers
 2013-05-24 14:30:36 -07:00
Chinsky
30d93bd7d2 Fixed indentation derp. 
I guess it was a dream when I saw it compiling.
 2013-05-24 01:02:52 +04:00
cib
89aa936147 Fix to organ_failure event. 2013-05-23 22:46:27 +02:00
Chinsky
665aaea722 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into tentacles 2013-05-24 00:43:33 +04:00
cib
b1b448e0ee Adjusted event announcement delays. 
Also improved some radiation belt announcements.
 2013-05-23 20:15:45 +02:00
cib
aa6bfc33c7 Airlock and APC changes. 
- Added a debugger device that can figure out when an object has been hacked/emagged
- Hacked APCs no longer display blue screen
- You can now disassemble emagged airlocks, they will yield a fried airlock electronic.
 2013-05-23 16:43:29 +02:00
Chinsky
629022f7b0 Fixes #2836 
Winners do not use space drugs.
Fixes LSD giving you an ability to escape death once.
Whilst hilarious, this can be breaking things that depend on mob staying dead after calling death().
My guess is that at some point halloss was counted in UpdateHeath(), but it is not anymore, so people don't die from combination of halloss and other damages being over 200.
 2013-05-23 15:06:37 +04:00
Chinsky
8b60bab4a7 Merge pull request #2835 from Roaper/master 
No tears, only dreams
 2013-05-23 01:55:45 -07:00
Roaper
cb59473d02 Added more dreams to Dreaming.dm 
Signed-off-by: Roaper <roaperable@gmail.com>
 2013-05-22 13:36:27 -07:00
Chinsky
317cbd8438 Merge branch 'master' into bleeding-edge-freeze 
Conflicts:
	baystation12.dme
 2013-05-22 16:51:41 +04:00
Chinsky
1ca42d0c88 Fixed some sharp stuff not being recognized as such. 
That lead to knives bruising people you stab, for example.
 2013-05-22 12:55:15 +04:00
Chinsky
8b01f8bcc3 Finished up tentacle abominations. 
Clone damage will cause body parts to mutate.
The more damage you have, the more chance to get a sweet tentacle.
Healing works other way, the less damage you have, the more chance to unmutate it.
Healing all the damage fixes everything.
 2013-05-21 05:40:00 +04:00
Chinsky
99fcf1b3be Merge pull request #2819 from Roaper/master 
Readded Pockets in the Responder Jackets
 2013-05-20 14:34:15 -07:00
Roaper
99ff1f7ee0 Added Pockets to First Responder Jacket 
Signed-off-by: Roaper <roaperable@gmail.com>
 2013-05-20 13:33:44 -07:00
Chinsky
7806915619 Added organ mutations. 
Only have sprites for humans yet.
Added is_usable() proc that checks for both limb missing or being a tentacle
 2013-05-19 17:56:29 +04:00
Chinsky
e032e3101d Merge pull request #2811 from caelaislinn/xenoarch 
Xenoarch tweaks
 2013-05-19 04:24:15 -07:00
Cael_Aislinn
1784bcbb04 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into rust 2013-05-19 19:41:18 +10:00
Cael_Aislinn
454d67d899 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into rust 2013-05-19 19:34:10 +10:00
Cael_Aislinn
7067382f52 hardcapped xenoarch machinery heat to 177K, made xenoarch machinery only produce heat when scanning, added a couple of missing tools to the gearbelt 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-05-19 19:12:42 +10:00
Cael_Aislinn
1d9fe082d7 made TEG generate power from heat transferred again, restructed TEG and circulator code to be smaller and cleaner, added an "overload" to TEGs where they spark + power output drops if power output exceeds 250k 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-05-19 18:50:15 +10:00
cib
f5b0b52b6c Added stasis bag. 
This stops all life functions of a patient for a while. It can only be used once, and inflicts low amounts of brain and clone damage over time.
 2013-05-19 07:48:43 +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
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
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
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
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
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
Jamini
5b14c5081c Adjustment 
Signed-off-by: Jamini <mobiousjami@gmail.com>
 2013-05-16 21:26:26 -04: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
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