cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-27 17:41:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,514 Commits 61 Branches 14 Tags
d4f76558593ca227a2fbc2ed93be29c06b796553
Commit Graph

2750 Commits

Author SHA1 Message Date
Ikarrus
d4f7655859 Update examine.dm 2013-05-15 23:24:24 -05:00
Ikarrus
b0e8d18e30 -Rewrote unequipping modules for cleaner code 
-Cyborg rods now properly regenerate in while charging
-cyborg rods can no longer be used to generate metal
-Removed roman numerals from the icon
 2013-05-15 22:23:07 -06:00
Ikarrus
cc67adb828 Merge branch 'master' of https://github.com/tgstation/-tg-station into borgnerf 2013-05-15 19:05:09 -06:00
Cheridan
0bd3a5a534 Merge pull request #528 from Rolan7/HydroponicsTweaks 
Changed moneyplants to use the plant's potency...
 2013-05-15 14:02:28 -07:00
Ikarrus
e54bc1aee0 Replaced borg crit state with a gradual breakdown of its functions. 
Moved the self check after the health check for welding tools
 2013-05-15 08:25:02 -06:00
Ikarrus
ba1277ac1e Merge branch 'master' of https://github.com/tgstation/-tg-station into borgnerf 2013-05-15 07:49:34 -06:00
Cael Aislinn
65b7b1765f Merge pull request #574 from Carn/Issue559 
Fixes #559 - Changelings are no longer so obviously faking when they are...
 2013-05-15 02:38:40 -07:00
Ikarrus
0eaba8311d Merge branch 'master' of https://github.com/tgstation/-tg-station into borgnerf 
Conflicts:
	html/changelog.html
 2013-05-14 22:17:23 -06:00
Ikarrus
faa3fd6c10 Cyborg Budget Cuts 
-Cyborg RCD cost increased from unit*30 to unit*160
With a standard 15k power cell, you can still build:
93 floors
31 walls
18 deconstructions
9 airlock operations
-Reduced cyborg health from 300 to 200
-Cyborgs with less than 100 health can not use any modules, but can still move, speak, and wirelessly interact with machines
-Engineering cyborgs can now use metal rods
-Updated changelog
 2013-05-14 22:12:15 -06:00
Aranclanos
cfbd530a2b Merge pull request #563 from Malkevin/prisonercards 
Proper Vandykes
 2013-05-13 23:29:33 -07:00
Giacomand
ecd209a6f6 Merge pull request #529 from KazeEspada/mice 
mice become items when they die.
 2013-05-13 12:03:23 -07:00
Malkevin
8ce6ed460b PR #560 - Enabled security clearance checks for SecHuds. 
Checks can be bypassed via EMPs.

Modified   code/modules/clothing/clothing.dm
Modified   code/modules/clothing/glasses/glasses.dm
Modified   code/modules/clothing/glasses/hud.dm
Modified   code/modules/mob/living/carbon/human/human.dm
Modified   html/changelog.html
 2013-05-12 20:48:23 +01:00
carnie
0fe659c43c Fixes #559 - Changelings are no longer so obviously faking when they are faking death. 2013-05-12 20:34:42 +01:00
Pete Goodfellow
ff6cd843d8 Merge pull request #522 from Ikarrus/acidfix 
Acid Damage Fix
 2013-05-12 07:41:54 -07:00
Pete Goodfellow
31c4a7559b Merge pull request #537 from Ikarrus/plastic 
Facial Reconstruction Surgery
 2013-05-12 07:23:06 -07:00
carnie
7d3236ca1e Resolves an issue with commit f3996dfc5e doing the opposite of what it was supposed to. 
Mobs can now become bloody again...after 9 months of going unnoticed.

Credits to Mport for this fix <3

Modified   code/modules/mob/living/carbon/human/human_defense.dm

Signed-off-by: carnie <elly1989@rocketmail.com>
 2013-05-12 11:07:31 +01:00
Intigracy
1c1b33bd8d Pull Request #548 - vareditting ckey, key, icon, icon_state, overlays, underlays have permission alternatives 
Fixed indentation reauthored and rebased ~Carn
Fixed the things carn pointed out. Thanks. ~Intigracy
ckey editing and icon editing changes, added alternate requirements besides +DEBUG. ~Intigracy

Modified   code/modules/admin/verbs/modifyvariables.dm

Signed-off-by: carnie <elly1989@rocketmail.com>
 2013-05-12 02:42:52 +01:00
Malkevin
b3668c8db7 Proper Vandyke 
Vandykes are a tash and chin fungus, old sprite was some weird long handle bar thing.

Added some proper vandyke sprites, renamed old ones to fu manchu and added that as another facial hair style
 2013-05-12 00:37:40 +01:00
Ikarrus
c333680f28 -Added high-visibility orange ID card icon for prisoner IDs 
-Fixed the hud icon not showing up for prisoners
 2013-05-11 15:22:52 -06:00
Ikarrus
4b1ccb9ec7 Increased object melt chance from meltprob*2 to meltprob*3 2013-05-11 12:14:51 -05:00
Pete Goodfellow
ffc42099e1 Merge pull request #521 from Rolan7/ClownstampBugfix 
Fixes the bug where clown stamps were usable by anyone
 2013-05-08 08:33:15 -07:00
Ikarrus
f9d4926ad7 Facial Reconstruction Surgery 
Plastic Surgery will restore the face if it is disfigured by acid.
 2013-05-08 08:52:38 -06:00
Ikarrus
9378c020b8 Increased sacid meltprob from 5 to 10 2013-05-06 20:29:01 -06:00
KazeEspada
27c6028dbf mice become items when they die. 
mousetraps now make the SNAP sound based on their location rather then the targets.
 2013-05-06 19:25:00 -07:00
Rolan7
d379f74a30 Changed moneyplants to use the plant's potency instead of a random value when generating spacecash. 2013-05-06 18:38:55 -04:00
Malkevin
086ac268b3 Changed all crit checks from static zeros to config.health_threshold_crit 2013-05-06 18:31:51 +01:00
Ikarrus
0c0231779f Updated object melt probability I overlooked. 2013-05-05 19:13:29 -06:00
Ikarrus
521bd5df60 Acid Damage Fix 
Redid a portion of how acid damage is applied. People were not being disfigured when sprayed, and contact with acid for some reason had a 15% chance to do ridiculous damage (~30 per spray puff), otherwise it did very little (~6). It should be more consistent now around the ~12 range per spray puff.

Glasses melt too, now.
 2013-05-05 19:05:39 -06:00
Rolan7
5bc16a523e Fixes the bug where clown stamps were usable by anyone, they just didn't affect the sprite. 
Also made the stamp check for clumsiness instead of mind.assigned_role.
 2013-05-05 20:53:15 -04:00
Malkevin
b91889ba29 Changed the health check for crit in life.dm for humans, monkeys, and aliens from < 0 to <= 0. 
Fixes that weird issue where people can take 5 laser hits to the face and still run around at 0 health until someone sneezes on them or they stub their toe.
 2013-05-05 17:38:30 +01:00
Cael Aislinn
1fa40ccd22 Merge pull request #514 from Tastyfish/cablez 
Addressed hulk speach inconsistant punctuation and cable coil problem
 2013-05-05 02:43:23 -07:00
Tastyfish
d20c7a4bd2 Made hulk talking change all periods to exclamation points 2013-05-05 05:32:01 -04:00
Tastyfish
7b325f9c6e re-arranged cable actions so src wouldn't get deleted before everything was completed 2013-05-05 05:17:31 -04:00
Carnie
4ca7b5079b Merge pull request #503 from Ikarrus/medalicon 
Minor fix for medals - makes overlay update when pinning a medal to somebody else.
 2013-05-04 17:20:42 -07:00
Pete Goodfellow
7111f86a2b Merge pull request #432 from Rolan7/master 
Issue 113 mob->closet->wall glitch fix.
 2013-05-04 11:18:42 -07:00
Ikarrus
7694776d1f Added a update_inv_w_uniform(0) to pinning medals, so it shows up on the mob icon. 2013-05-04 11:19:49 -06:00
Cael Aislinn
827c72fb72 Merge pull request #483 from kyrahabattoir/gui_stamps 
[MAP]Graphical stamps on documents.
 2013-05-03 22:04:31 -07:00
Cael Aislinn
242fc2813f Merge pull request #449 from TwistedAkai/master 
Syringe log: Resolves issue #321
 2013-05-03 21:45:09 -07:00
Blaank
dd9d3fce8d Changed a name so the Chemmaster 3000 will close the interface window when the [close] button is pressed. Previously when the [close] button was pressed it would do nothing and the interface window had to be closed via the window controls. 2013-05-02 23:06:42 -05:00
Malkevin
e2b8a45d42 Merge branch 'master' of https://github.com/tgstation/-tg-station into irongrinder 
Conflicts:
	html/changelog.html
 2013-05-02 15:11:23 +01:00
Cael Aislinn
474722d425 Merge pull request #447 from Carn/DNArework 
Resolves #283
 2013-05-02 05:46:44 -07:00
Kyrah Abattoir
cf13402d86 Added pictures for all the different stamps in the game to show them on paper. 
Changed the way stamps are displayed in html (no <HR> between them, only one at start).
Made the QM and law office stamps unique (and changed them in the maps).
Made the default stamp a "granted" stamp.
Added a "granted" stamp and paper_stamp sprite (green checkmark).

Signed-off-by: Kyrah Abattoir <github@kyrahabattoir.com>
 2013-04-30 21:43:00 +02:00
Pete Goodfellow
aa3efe20d6 Here's the proper cable.dm 2013-04-30 16:32:07 +01:00
carnie
ae00173037 Merge branch 'master' of github.com:tgstation/-tg-station into pr/447 2013-04-30 04:07:28 +01:00
Malkevin
e9a5f9df8a Added Plasteel (iron + plasma) and Reinforced Glass (iron + silicon) 2013-04-30 03:16:03 +01:00
Malkevin
a83bbc9404 More grind-able sheets 
Metal sheets can now to ground down for iron
Glass sheets can be ground down for silicon
Wood sheets can be ground down for carbon
 2013-04-30 02:31:03 +01:00
Pete Goodfellow
9343a93820 Reverting stray changes from my merge of #464 2013-04-30 00:06:30 +01:00
Cheridan
e4bccfc229 Merge branch 'master' of https://github.com/tgstation/-tg-station into Master 
Conflicts:
	html/changelog.html
 2013-04-29 14:39:25 -05:00
Ikarrus
e7bcf2dbfc Part one is here: #450 
This pull request adds the box of medals to the map (Captain's Office), as well as updating the changelog.html

Also includes minor string and sprite fixes.
 2013-04-27 18:43:05 -06:00
Ikarrus
b34c18ce3d Select Equipment update 
-Renamed 'Strip' to 'Naked'
-Added Assistant
-Re-added Death Commando
-Added job titles to IDs of figures who should have it displayed. Shortened the titles of some of them so it wouldn't make ID and PDA names too long.
 2013-04-27 09:37:06 +10:00