cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-30 11:01:35 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,832 Commits 61 Branches 14 Tags
dfae7a2ff231eee047bcd808f02576472d440d3c
Commit Graph

2861 Commits

Author SHA1 Message Date
Aranclanos
dfae7a2ff2 Fixes the "wrapsortjunction", the disposal pipe that sorts wrapped objects. It had a duplicate New() proc. 
Gitblame best tool, the award goes to donkie.
 2013-06-24 02:46:42 -03:00
Cheridan
5a83f85c83 Merge pull request #804 from Ikarrus/tplog 
Traitor Panel Improvements
 2013-06-19 21:08:14 -07:00
Giacomand
20a9dd130b Merge pull request #789 from Carn/member_content 
Resolves an issue with sanitize_hexcolor where it'd return an incomplete...
 2013-06-19 06:45:40 -07:00
Giacomand
c838e2d348 Merge pull request #798 from MrPerson/zone_sel 
Redo of zone_sel/Click() to be much simpler.                                                             Zone_sel is the paper doll ...
 2013-06-18 17:59:53 -07:00
Cael Aislinn
3dfbdfb1b6 Merge pull request #776 from Giacomand/chem_smoke_fix 
Fixed chem smoke not waiting for other reagents to mix before reacting a...
 2013-06-18 17:54:42 -07:00
Cheridan
c51ac5e860 Merge pull request #803 from Ikarrus/centcom 
Standardized spelling of all instances of "Centcom"
 2013-06-18 17:11:25 -07:00
Ikarrus
9b395d65ca Admins get notified when someone replies to a syndicate transmission. 2013-06-17 22:46:16 -06:00
Ikarrus
26becb3937 Traitor Panel Improvements 
-Added logging for admins editing objectives
-Added logging for admins adding new antagonists
-Changed the antag role assignment buttons to something more appropriate for the game modes. Will now tell you if someone is loyal (implanted).
-Added a isloyal() proc to check if a mob is loyalty implanted.
-Made the headrev message more noticeable
 2013-06-17 22:39:32 -06:00
Ikarrus
1518d285e7 Standardized spelling of all instances of "Centcom" 
Centcomm/CentComm -> Centcom
centcomm -> centcom
 2013-06-17 20:49:01 -06:00
Giacomand
5511b0b8d2 Merge pull request #786 from Zelacks/master 
Missing Tea Sprites
 2013-06-17 06:43:49 -07:00
Matevž Baloh
6ef1c83338 Merge pull request #774 from Giacomand/pull_click 
CTRL+Clicking won't cancel a pull if you try to pull the same object.
 2013-06-17 06:42:57 -07:00
MrPerson
4f2f583a5d Redo of zone_sel/Click() to be much simpler. Zone_sel is the paper doll on the screen where you choose what body part to target. Fewer sections under switch statements, plus a check to only update the icon if there's been a change. 
tgstation.dme is a fixed version without FILE_DIR set. Gitblame!
 2013-06-17 05:06:03 -07:00
Zelacks
cad400a27e tea and ice tea sprites 2013-06-17 00:34:40 +08:00
carnie
52c48d11aa Resolves an issue with sanitize_hexcolor where it'd return an incomplete string such as "" 
Resolves an issue where whitespace in names could cause a saveslot button to wrap to the next line.

Byond members:
can colour their name using the admin ooc-colour feature.
get a icon next to their name in ooc chat.
can choose their icon_state as a ghost.
get 8 saveslots

unlock_content tracks the return of IsByondMember(). This is to allow for easier testing/debug.
 2013-06-16 11:08:39 +01:00
Giacomand
663d878df6 Fixed chem smoke not waiting for other reagents to mix before reacting and then clearing the contents; often causing instances where that dangerous poly grenade only gives off Sugar. 2013-06-15 19:40:49 +01:00
Pete Goodfellow
c7c3bd48de Merge branch 'master' of github.com:tgstation/-tg-station into assemblyfun 
Conflicts:
	code/game/objects/items/weapons/grenades/chem_grenade.dm
	html/changelog.html
 2013-06-15 18:58:11 +01:00
Giacomand
27b4a6c443 * CTRL+Clicking won't cancel a pull if you try to pull the same object. 2013-06-15 15:43:28 +01:00
Uristqwerty
f6733d4921 Optimizations in insignificant procs (less than 2% of total self time each (according to the june 7 profile), and the changes probably don't have a huge impact on them. 
/turf/simulated/proc/update_air_properties()
 - Changed border lists to use |= rather than -= then +=.

/datum/camerachunk/New()
 - Uses block() rather than range() and a coordinate check

Comment (copied to two places) outlining a potential optimization. (potential as in "needs to be tested whether it actually makes things faster")
 2013-06-12 15:30:52 -04:00
Cael Aislinn
925e1b9fa8 Merge pull request #659 from Petethegoat/catch 
Added catching.
 2013-06-10 05:07:24 -07:00
Cael Aislinn
cc66ec46db Merge pull request #552 from dumpdavidson/monkeyize 
Monkey - Human transformation
 2013-06-10 02:27:52 -07:00
dumpdavidson
1a338be330 Fixed duration of the transformation. 2013-06-10 10:55:19 +02:00
dumpdavidson
87a28b67e0 Merge remote-tracking branch 'remotes/origin/master' into monkeyize 2013-06-10 10:54:09 +02:00
Ikarrus
19285384ef Traitor scale added to game_options.txt 
-Added traitor_scaling_coeff and changeling_scaling_coeff to server configuration files, allowing server operators to adjust the values to their preference.
-Updated changelog
 2013-06-09 12:32:58 -06:00
Cael Aislinn
0c9b1b1cd5 Merge pull request #697 from Malkevin/Improved_eyecheck() 
Improved eyecheck()
 2013-06-08 18:53:25 -07:00
Cael Aislinn
cb1896aabf Merge pull request #698 from Incoming5643/podpersonfix 
Fixes Pod Person Cloning
 2013-06-08 18:00:59 -07:00
Cael Aislinn
45d5ec0532 Merge pull request #707 from AndroidSFV/adminmanifest 
Admin "Show Crew Manifest" verb 'fix'
 2013-06-08 17:51:26 -07:00
Cael Aislinn
f8808bbd3b Merge pull request #727 from Giacomand/pickpocket 
Emptying someone's pockets won't display a message anymore. This allows ...
 2013-06-08 17:49:31 -07:00
Giacomand
be550b196e The victim will now get a message if the user empties their pockets and gets interrupted. (Victim moving, user being stunned, etc..) 2013-06-06 18:01:14 +01:00
Giacomand
8fee615d85 * Added a message to the user. 2013-06-06 14:15:19 +01:00
Giacomand
e83fada8c1 Emptying someone's pockets won't display a message anymore. This allows people to pickpocket if their victim stands still long enough. 2013-06-06 08:17:53 +01:00
Cheridan
df681bed40 Food update - 
-Removes all the dumb weapon/syntiflesh recipes. Remove syntikebab. Cleans up commented-out stuff that'll never be readded.
-Deletes jar.dm, which I tried to delete months ago but somehow messed up.

-'Imitation' carp meat can now be made with 5 units of carpotoxin and some tofu.
-Some recipes changed slightly.
-Adds berry muffins and booberry muffins.

Cleaned up the carton-based sprites in drinks.dmi to look better.
New sprites for muffins, donut boxes, brain burgers, super big bite burgers, enchiladas, monkey delight, baguettes, fried eggs, wing fang chu, clown's tears, and mystery soup.

I also completely reorganized the food.dmi
(and made my bed and mopped the floors)
 2013-06-04 14:45:40 -05:00
incoming
478cdf480b *Replica pods seeds will now only accept the first valid blood sample it's given, and won't be overwriten with null values if you accidentally jab the seeds with the empty syringe afterward. 
*Fixes Issue #275
 2013-06-03 12:32:43 -04:00
AndroidSFV
af667da901 Makes the admin "Show Crew Manifest" verb inside the secrets window actually show the Crew Manifest, instead of the old dumb way of just looking at whatever ID human players are holding. 2013-06-02 19:22:47 -05:00
Malkevin
af3737b4b9 comments for new defines 2013-06-02 17:16:32 +01:00
Malkevin
31ded0900d Removed accidentally included mask test item 2013-06-02 17:09:44 +01:00
Malkevin
b9a370f310 Changes the check for blindfolds healing eye damage and making the mob blind to work off tintcheck() 2013-06-02 17:06:06 +01:00
Malkevin
7e610b6677 Improved eyecheck() 
Changes flash/welder protection eyecheck() proc from several hard coded  item checks to a /var check for eye covering items, reducing the number of IF statements and allowing greater flexibility as child items can have a different protection level to their parent.

Created a new proc tintcheck()
-Items have a separate tint var to allow for items to protect but not impair, such as space helmets.
-tintcheck() adds these up for eye covering locations
-life.dm uses this new proc when checking to apply the welder overlay instead of hardcoded if statements
 2013-06-02 02:04:47 +01:00
Cael Aislinn
1ab959dc4f Merge pull request #562 from Ikarrus/hudicons 
Updated Hud Icons with department colors
 2013-05-31 23:42:26 -07:00
Cael Aislinn
cd36661610 Merge pull request #644 from Ikarrus/latejoin 
Latejoining Antagonists
 2013-05-31 23:25:06 -07:00
Cael Aislinn
871b775100 Merge pull request #655 from Carn/HelpersTidy 
*Small tidy-up of various helper procs*
 2013-05-31 23:24:38 -07:00
Cael Aislinn
c765bb9d47 Merge pull request #675 from d3athrow/oneclickantagfix 
Fixes the Create Antagonist: one click antag Nuke Team. Requires atleast...
 2013-05-31 23:23:35 -07:00
Pete Goodfellow
6d62eade3d Merge branch 'master' of github.com:tgstation/-tg-station into assemblyfun 
Conflicts:
	html/changelog.html
 2013-05-31 18:31:14 +01:00
Pete Goodfellow
5ffed82431 Fixed all the bugs that Dumpdavidson mentioned. 2013-05-31 18:08:08 +01:00
Cael Aislinn
41364fc293 Merge pull request #662 from Petethegoat/hang 
Nooses and table fix
 2013-05-31 05:00:20 -07:00
Cael Aislinn
0d8a9e6809 Merge pull request #665 from Petethegoat/equipfix 
Misc fixes- #649 and #663
 2013-05-30 21:48:22 -07:00
Cael Aislinn
4d163db55e Merge pull request #683 from KazeEspada/temperature 
temperature gun fix
 2013-05-30 21:46:14 -07:00
Cael Aislinn
0c269798ad Merge pull request #666 from Petethegoat/i_know_what_youre_thinking_did_i_fix_six_bugs_or_only_five 
A fistful of fixes
 2013-05-30 21:34:53 -07:00
d3athrow
8f8ab8ebf0 Added a break to the nested loop after the candidate was chosen, without it every candidate would get chosen regardless. 2013-05-30 23:32:05 -05:00
KazeEspada
6fddcb4e61 gives temperature guns a high capacity cell. fixes #265 
removes a duplicated line in power_cells.dm
 2013-05-30 10:20:22 -07:00
d3athrow
a2999b86a0 Fixes the Create Antagonist: one click antag Nuke Team. Requires atleast 3 people to click yes with a maximum of 5 agents possible. 2013-05-29 16:26:25 -05:00