cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-19 05:26:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,173 Commits 61 Branches 14 Tags
01dedd5ea2e36fdba4fba8359dccea2ce12295a9
Commit Graph

186 Commits

Author SHA1 Message Date
phil235
d5a7d82959 Fixes a lot of "the the" in messages. 2014-12-16 22:59:55 +01:00
Razharas
7758a0afed Ok now explosions shall work properly 
Changed severity to target, make items not destroy themselves on
severity lower than 1, all that stuff
 2014-12-05 23:21:48 +03:00
Razharas
3511e0dada Merge branch 'master' of https://github.com/tgstation/-tg-station into Cfour 
Conflicts:
	code/game/turfs/simulated/walls.dm

Ye somth liek dat
 2014-11-23 17:46:14 +03:00
Razharas
ff456ebaf4 Unwinded most of shit 
Meh
 2014-11-19 21:36:45 +03:00
tkdrg
0db30a6534 Fixes issues with TK teleporting pictures and harvested plants. 2014-11-18 15:49:03 -03:00
Menshin
b77e2fc46a Conflicts solving 2014-11-04 20:24:52 +01:00
phil235
128c9222e5 Adding checks for stun, restrained to many object verbs. 
Fixing paper and supply manifest description upon examination.
Fixing being able to adjust jumpsuit while restrained.
Fixing one typo.
 2014-11-01 19:18:01 +01:00
phil235
9779600e81 Error message due to being clothed during ass photocopy only appears once now. You can no longer photocopy the ass of alien larvas, they have no ass. Weapon/paper now has a layer of 3 and won't appear in front of mobs. 2014-10-27 20:27:03 +01:00
Hornygranny
95010abae1 changed ishuman to tool user check 2014-10-17 13:08:13 -07:00
Hornygranny
e30bb58e4e nonhumans can no longer write 2014-10-17 10:25:57 -07:00
Remie Richards
e124c29f8d Merge pull request #5201 from Cheridan/permits 
Adds Construction Permits
 2014-10-17 05:24:37 +01:00
Menshin
26f70fd9aa * Completed the _strip_html_properly_ proc to also limit the length of the text 
* Removed uses of _strip_html_simple_
* Replaced input or redondant trimming/text_copying with the new unified _stripped_input_
 2014-10-15 16:00:22 +02:00
Menshin
8933943b50 Prevent using force pull on paper bins to grab them from the other side of the station. 2014-10-12 01:43:27 +02:00
Cheridan
84e7121903 Adds construction permits 2014-10-11 17:39:27 -05:00
Cheridan
f5b5ead3ef Merge pull request #4516 from MrPerson/examinate_the_doctor 
Change examine() from an atom verb to a mob verb
 2014-10-05 23:37:34 -05:00
Cheridan
08be1b34eb Revert "Changes a few green crosses to blue on sprites that I missed last time" 2014-10-04 19:22:10 -05:00
MrPerson
651c3e6db5 Merge to master - sole conflicting file was ninja.dm FUCK NINJAS 2014-10-04 01:45:39 -07:00
Miauw
7c97447d24 Balance changes to the sleepypen. 2014-09-05 18:24:25 +02:00
Miauw
78a9b0be69 Merge branch 'master' of https://github.com/tgstation/-tg-station into say() 
Conflicts:
	code/__HELPERS/game.dm
	code/game/gamemodes/cult/runes.dm
	code/game/machinery/requests_console.dm
	code/game/machinery/telecomms/logbrowser.dm
	code/game/objects/items/devices/PDA/radio.dm
	code/game/objects/items/devices/aicard.dm
	code/modules/admin/admin_verbs.dm
	code/modules/assembly/holder.dm
	code/modules/assembly/voice.dm
	code/modules/mob/living/carbon/brain/brain.dm
	code/modules/mob/living/carbon/human/whisper.dm
	code/modules/mob/living/carbon/slime/slime.dm
	code/modules/mob/living/say.dm
 2014-08-31 13:40:16 +02:00
MrPerson
a23dbe2357 Merge branch 'master' of https://github.com/tgstation/-tg-station into examinate_the_doctor 
Conflicts:
	code/game/objects/items/devices/radio/radio.dm
	code/game/objects/items/toys.dm
	code/game/objects/items/weapons/tanks/tank_types.dm
	code/game/objects/items/weapons/tanks/tanks.dm
	code/modules/events/ninja.dm
	code/modules/power/cell.dm
	code/modules/power/port_gen.dm
	code/modules/reagents/reagent_dispenser.dm
 2014-08-29 04:21:15 -07:00
Firecage
dac8669166 Span classes for files in the following module folders: assembly, client, detectivework, events, hydroponics, mining, paperwork 2014-08-23 10:13:21 +02:00
MrPerson
44383ec1c8 Disregard that I suck cocks 2014-08-21 07:35:51 -07:00
MrPerson
d0c97aae72 Merge branch 'master' of https://github.com/tgstation/-tg-station into examinate_the_doctor 
Conflicts:
	code/ATMOSPHERICS/components/unary/vent_pump.dm
	code/game/gamemodes/cult/ritual.dm
	code/game/gamemodes/nuclear/pinpointer.dm
	code/game/machinery/spaceheater.dm
	code/game/machinery/status_display.dm
	code/game/objects/effects/decals/crayon.dm
	code/game/objects/items/stacks/stack.dm
	code/game/objects/items/weapons/airlock_painter.dm
	code/game/objects/items/weapons/cigs_lighters.dm
	code/game/objects/items/weapons/storage/secure.dm
	code/game/objects/items/weapons/tanks/tank_types.dm
	code/modules/assembly/assembly.dm
	code/modules/assembly/holder.dm
	code/modules/assembly/mousetrap.dm
	code/modules/mob/living/carbon/alien/special/facehugger.dm
	code/modules/mob/living/carbon/slime/examine.dm
	code/modules/power/cable.dm
	code/modules/reagents/grenade_launcher.dm
	code/modules/reagents/reagent_containers/food/drinks.dm
	code/modules/reagents/reagent_containers/food/snacks.dm
	code/modules/reagents/reagent_containers/glass.dm
	code/modules/recycling/sortingmachinery.dm

Thanks Firecage, this is all your fault
 2014-08-20 05:54:20 -07:00
AndroidSFV
cab1fe8e25 Bug fixes to AI photography Ext. 2 2014-08-13 14:42:36 -05:00
Miauw
891546aa56 More work on saycode. 2014-08-05 16:02:21 +02:00
AndroidSFV
fad2bb1244 Fully implemented AI photography, with HUD! 2014-07-30 15:21:30 -05:00
paprka
3bf4ecfba5 fixes laziness 2014-07-18 18:30:23 -07:00
Alex
2d4ca8d363 Merge pull request #4150 from Ikarrus/miningfix 
[MAP] Mining Delivery System
 2014-07-17 09:30:19 +01:00
ikarrus
0a62bfb159 part II 2014-07-13 13:43:07 -06:00
ikarrus
9d2bed1501 [MAP] Mining Delivery System 
-Redone the delivery system on mining to send the unrefined ore from the outposts to the mining station, ready to be picked up by miners, instead of being fed directly into the smelting line
-Smelting line still exists, but starts blocked off
-Updated paper with correct instructions on where to redeem points
-Fixed mint's atmos and door name. Added a camera there, too.
 2014-07-13 13:30:57 -06:00
Miauw
4eb83ed546 Oh, not in cruelty, not in wrath 
The Reaper came that day;
An angel visited this damned sat,
  And took the parapen away.

Replaces parapen with sleepypen that contains 30u of sleeptoxin and 30u of a new mutetoxin that makes you unable to speak.

Mutetoxin can be made with 2 parts uranium + 1 part water + 1 part carbon.
 2014-07-12 17:48:33 +02:00
AndroidSFV
da1f3a7fce AI photography ext 2 DO NOT MERGE YET 2014-07-06 12:06:44 -05:00
Kelenius
d8ae776f64 Gives the AI a hud 2014-07-03 18:52:11 +04:00
MrPerson
c43518351f Some fixes and minor improvements to examining. 2014-06-13 09:01:52 -07:00
MrPerson
59d64656c4 Some fixes and minor improvements to examining. 2014-06-09 11:35:29 -07:00
MrPerson
645ca7f8a1 Merge branch 'master' of https://github.com/tgstation/-tg-station into examinate_the_doctor 
Conflicts:
	code/_onclick/click.dm
	code/game/atoms.dm
	code/game/objects/items/toys.dm
	code/modules/paperwork/folders.dm
	code/modules/power/cable.dm
 2014-06-09 01:50:44 -07:00
ikarrus
01c28c7afc Fixed indentations. 2014-05-14 09:02:53 -06:00
ikarrus
8496ec8dd1 Should be auto-mergable again 2014-05-14 08:57:52 -06:00
ikarrus
593c95cc4f [MAP] Firing Range Instructions 
-Added instructions to the firing range.
-Set a default path for the controls
-Controls are no longer dense
 2014-05-10 19:53:48 -06:00
ikarrus
47fbd14f57 Glory to absolute pathing 2014-05-06 09:02:19 -06:00
ikarrus
82639d14a6 Secret Document Objectives 
Adds new steal objective "Secret Documents"
-A set of secret documents spawn in the vault's filing cabinet, but even syndicate documents qualify as valid steals

Adds the exchange objective for traitors
-If there are at least 6 traitors, two of them will be selected to make an exchange of secret documents
-There is a low (20%) chance that one of them will have an additional backstab objective, where they will require both sets of documents to win
 2014-05-04 15:00:47 -06:00
MrPerson
9d9a657acf Change examine() from an atom verb to a mob verb 
Just in time for the feature freeze, a big change that will introduce bugs! Yay!
Mob verb is called verb/examinate(target), which just calls target.examine(user) and face_atom(target)
For explanation why, see http://www.byond.com/forum/?post=1326139&page=2#comment8198716
Long story short, mob verbs are much faster than object verbs. The goal is to make right-click menus populate faster.

Also changes a bunch of examine() procs to always, ALWAYS call the parent. Except mobs, but you have 1 guess why I'm not touching them. Mostly this affects obj/item/examine().
And also remove a whole shitload of pointless set src in view(2) kind of crap. Also span classes.
 2014-05-01 09:56:39 -07:00
phil235
c08a40e56b fixes polaroid camera description 2014-04-30 19:34:35 +02:00
Miauw
658c753989 Revert "Merge pull request #3218 from AndroidSFV/aiphotoext2" 
This reverts commit f2d850ee25, reversing
changes made to 805e2570bf.
 2014-04-21 18:59:58 +02:00
AndroidSFV
58b602a59e Gia's Feedback. Thanks!! 2014-04-12 14:01:02 -05:00
AndroidSFV
50cd395c4f Merge branch 'master' of https://github.com/tgstation/-tg-station into aiphotoext2 
Conflicts:
	code/datums/wires/robot.dm
	html/changelog.html
 2014-04-08 09:28:42 -05:00
AndroidSFV
c7c085ffee Reduces "much duplicate" code. 2014-04-06 11:58:53 -05:00
Giacomand
e8d7526a0c Merge branch 'master' of https://github.com/Giacom/-tg-station into sec_maglite 2014-04-02 17:11:52 +01:00
Giacomand
f2bfa3f5d4 Renamed maglite to seclite. 
Refactor'd can_hold and cant_hold to use type paths instead of strings.
Removed an undefined object from the medical belt's can_hold list.
 2014-03-29 11:10:35 +00:00
AndroidSFV
cd11d87254 Added some feedback to cyborgs and others nearby when they print a picture. 2014-03-29 02:44:49 -05:00