cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-28 01:51:46 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,476 Commits 61 Branches 14 Tags
c8baf7748a41981eb95f90ffd658ca4f113b450e
Commit Graph

5119 Commits

Author SHA1 Message Date
Pete Goodfellow
c8baf7748a Reverting accidental changes. 2013-05-12 15:16:04 +01:00
Pete Goodfellow
46b8ba8341 Merge branch 'master' of github.com:tgstation/-tg-station into chemistry 
Conflicts:
	code/game/objects/items/weapons/tools.dm
 2013-05-12 15:09:21 +01: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
164ce9a02e Fix for missing in-hand sprites for orange id cards 2013-05-11 23:15:37 +01:00
Ikarrus
46c4d811bc Minor change to hud icon checks 2013-05-11 15:29:09 -06: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
Malkevin
8e32c007ed Made the new prisoner ID box a parent of /box instead of /box/ids, 2013-05-11 17:32:11 +01:00
Malkevin
26cf12cf1a Merge branch 'master' of https://github.com/tgstation/-tg-station into prisonercards 
Conflicts:
	maps/tgstation.2.1.2.dmm
 2013-05-11 17:18:34 +01:00
Ikarrus
5b5f880ab2 -Replaced bridge tcoms monitor with power monitor 
-Fixed thunderdome blast doors not working
-Added a small dressing room to centcom so I don't have to spawn them each and every time
-Renamed some centcom areas, including the admin prison to make it easier to send players there
 2013-05-11 00:36:13 -06:00
Cheridan
8b544bb9a8 Merge branch 'master' of https://github.com/tgstation/-tg-station into Master 2013-05-08 11:26:43 -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
Pete Goodfellow
b4fe1eded0 Merge pull request #484 from Ikarrus/clonebeard 
Bearded Clones
 2013-05-08 08:28:37 -07:00
Malkevin
f53202e158 Added a box of prisoner ID cards to the perma wing 
Aside from further dehumanizing criminal scum this also serves as a way of correcting the annoying behavior of suit sensors and crew monitoring computers, and chemical implants: if someone isn't wearing an ID card (which prisoners will likely have taken from them) they show up as an Unknown.

Also included a sec hud icon for the prisoner 'job'
 2013-05-08 01:09:32 +01:00
Cheridan
3d8fda7c26 Merge branch 'master' of https://github.com/tgstation/-tg-station into Master 2013-05-06 15:41:50 -05:00
Malkevin
086ac268b3 Changed all crit checks from static zeros to config.health_threshold_crit 2013-05-06 18:31:51 +01: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
Cael Aislinn
30cf4cd5d4 Merge pull request #502 from Ikarrus/stealdisk 
Nuke disk as standard steal objective
 2013-05-05 00:40:29 -07:00
Cael Aislinn
273ccdc8c3 Merge pull request #479 from Tastyfish/pipes 
Fixed problems with placing atmos machines connecting to the wrong thing.
 2013-05-05 00:39:40 -07: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
Cheridan
a6c3f4a78d Merge branch 'master' of https://github.com/tgstation/-tg-station into Master 
Conflicts:
	maps/tgstation.2.1.2.dmm
 2013-05-04 13:04:47 -05: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
Ikarrus
fc4c10c63e Replaced pinpointer steal objective with the nuke disk. 2013-05-04 11:06:39 -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
f0a51af7f4 Merge pull request #499 from Giacomand/ministation_merging1 
Closet Cleanup and Bins.
 2013-05-03 21:57:53 -07:00
Cael Aislinn
b1402b48ea Merge pull request #498 from Giacomand/bringbacksoap 
Re-added Syndie Soap
 2013-05-03 21:46:26 -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
Cael Aislinn
2f57c45e76 Merge pull request #478 from Malkevin/meltablefloortiles 
Recyclable floor tiles
 2013-05-03 21:16:10 -07:00
Giacomand
35f6a979bc * Small fix for closets picking up anchored items. 
* Made closets/crates pick up on their turf during initialization.
 2013-05-04 05:07:36 +01:00
Aranclanos
74fb61eeee Merge pull request #463 from Ikarrus/reactive 
[MAP] Reactive Armor as objective
 2013-05-03 19:24:58 -07:00
Malkevin
3d1a96975f reverting last commit. 
Wt.remove_fuel is 0 for a reason
 2013-05-04 02:07:20 +01:00
Malkevin
f8fa1fce09 Welding rods/shards/floortiles now costs welderfuel 2013-05-04 01:44:31 +01:00
Malkevin
9d673f1bd0 Merge branch 'master' of https://github.com/tgstation/-tg-station into meltablefloortiles 2013-05-04 01:34:34 +01:00
Giacomand
77b0fce80f * Fixed a typo. 2013-05-04 01:10:32 +01:00
Giacomand
b4229b0b24 * Fixed an accidental commit. 2013-05-03 22:42:12 +01:00
Giacomand
343bfe90b2 This commit was made to help increase the compatibility between MiniStation and /tg/station. 
* Restructured closets to be easier to add new features.
 * Added trash bins that you can hide in.
 * New sound effects for the bin, they are royalty free.
 * Personal lockers can now be (un)locked with your PDA/Wallet/Whatever.
 2013-05-03 22:32:17 +01:00
Giacomand
1d8df3874a * Re-added soap after it was mistakenly forgotten after the https://github.com/tgstation/-tg-station/pull/194 conversion. 2013-05-03 17:49:53 +01: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
Cheridan
5f933e2d3e Merge branch 'master' of https://github.com/tgstation/-tg-station into Master 2013-05-02 11:53:30 -05:00
Cheridan
725718dd5b -Replaces the holodeck boxing ring that no longer works with a dodgeball arena. Adds dodgeball sprites and defines. 
-Fixes the crew monitoring console disappearing when damaged (meant to do this before but the change didn't go through somehow)
-Readds the space piano, removes the useless /device subtype from its path.

-Makes tables use a less hardcoded method to determine iconstate.
 2013-05-02 11:52:55 -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
Malkevin
5cef64f237 Merge branch 'master' of https://github.com/tgstation/-tg-station into meltablefloortiles 
Conflicts:
	html/changelog.html
 2013-05-02 15:07:33 +01:00
Cael Aislinn
474722d425 Merge pull request #447 from Carn/DNArework 
Resolves #283
 2013-05-02 05:46:44 -07:00
Ikarrus
af02fdf629 Males are cloned with a full beard. 2013-04-30 21:00:35 -06:00
Pete Goodfellow
73b751d20b Merge pull request #476 from tgstation/fix 
Reverting stray changes from my merge of #464
 2013-04-30 14:07:16 -07:00