cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-18 13:04:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,658 Commits 61 Branches 14 Tags
b653e360de7de37fa6cb6fcf9ca20ce8a7d52ecc
Commit Graph

769 Commits

Author SHA1 Message Date
drynwyn
abefc24a87 Switch gangster ammo to match weapon 
Fixes #2988
 2014-03-07 09:54:59 -05:00
Cheridan
d4c81ce247 Merge pull request #2936 from MrPerson/jitterbug_dizzydummies 
Redo of jitteriness and dizziness.
 2014-03-03 11:35:27 -06:00
YotaXP
cb7052f81c Removed group_multiplier nonsense from gas_mixture. 
Moved gas_mixture.dm to the datums directory.
Deleted FEA.
 2014-02-28 18:12:33 -05:00
MrPerson
48923f9ce5 Redo of jitteriness and dizziness. 
Fixes #2923
 2014-02-27 23:19:44 -08:00
Perakp
965e7ad6d8 Merge to master 
Conflicts in mob.dm
 2014-02-18 23:59:59 +02:00
Perakp
1004235a28 Added feedback when you give spells to mindless mobs. 2014-02-14 21:47:41 +02:00
Perakp
7e324bb17c - Still fixing merge conflicts 
- Giving spells to mobs without minds should work
 2014-02-14 21:32:16 +02:00
Perakp
7ca06565b5 Merge remote-tracking branch 'upstream/master' into spellsFromBodyToMind 
Conflicts (Resolved):
	code/datums/spells/mind_transfer.dm
	code/game/gamemodes/wizard/artefact.dm
	code/modules/mob/mob.dm
	code/modules/projectiles/projectile/change.dm
 2014-02-14 20:57:11 +02:00
Miauw
9b8656247c u_equip is now called unEquip PANIC 2014-02-13 20:58:33 +01:00
Miauw
8c7ef19be6 Replaced before_take_item() and drop_from_inventory() with u_equip 2014-02-12 19:51:37 +01:00
MrPerson
c8144bc5c6 Nano UI for SMES 
Screenshot:
http://imgur.com/63D3f8b
Buttons are greyed because there's no input available.
 2014-02-05 16:32:07 -08:00
fleure
a854a41994 Merge pull request #2540 from Incoming5643/blobjob 
BE_BLOB and easy adminblobing
 2014-02-03 10:34:31 -08:00
hornygranny
c569654ebc Mobster items + shirt 2014-01-31 15:50:09 -08:00
Malkevin
302376eeeb Merge branch 'master' of https://github.com/tgstation/-tg-station into bugfixes 
Conflicts:
	code/game/objects/items/toys.dm
 2014-01-30 19:14:43 +00:00
Incoming
2320db2353 Remove Colons From Premises 2014-01-30 10:50:32 -05:00
Incoming
5c5cc6a72d Repurposes the outdated BE_MONKEY into BE_BLOB and seperates the alien and blob pools so people can prefer to be one or the other or both or neither. An annoucement should be made when this goes live so people are aware they have a new flag to set. 
Adds a dedicated button on the player panel so admins can easily turn specific players into blobs.
 2014-01-29 10:54:00 -05:00
Jordie0608
45ee53517a Outright removed toggle admin jump,spawn and revive buttons 2014-01-27 16:10:19 +11:00
Malkevin
a1c4c4bbd7 Merge branch 'master' of https://github.com/tgstation/-tg-station into bugfixes 
Conflicts:
	code/modules/mob/mob.dm
 2014-01-26 19:22:33 +00:00
Jordie0608
8d256558b4 totally didn't forget about this, no siree 2014-01-27 03:28:02 +11:00
Jordie0608
701f195b43 Commented out toggle admin-jump button 2014-01-27 03:15:08 +11:00
EuroNumbers
31d4f16e62 Fixes incompabilities of ban DB with Linux system 
ALWAYS USE LOWERCASE
 2014-01-22 23:58:57 +01:00
Pete Goodfellow
e8ed1a83f7 Merge branch 'master' of github.com:tgstation/-tg-station into waistcoat2 
Conflicts:
	code/game/objects/structures/crates_lockers/closets/job_closets.dm
 2014-01-20 19:29:47 +00:00
fleure
c73f6f7eec Merge pull request #2445 from Razharas/AbstractNonsense 
Fixes the admin notice thingie
 2014-01-20 10:27:47 -08:00
Cheridan
70e5618cb0 Merge pull request #2375 from Giacom/remove_icon_operations_from_premises 
[501] Refactored the code to remove most icon operations for changing an icon's colour.
 2014-01-19 16:06:25 -08:00
Razharas
2254ad4cb6 Fixes the admin notice thingie 
Fixes #2427
 2014-01-19 22:05:35 +04:00
Pete Goodfellow
5222191b73 Changes the waistcoat path from /obj/item/clothing/suit/wcoat to /obj/item/clothing/tie/wcoat so you can wear it under a spacesuit or suit jacket. 
Also makes ties show up on the jumpsuit object.
 2014-01-19 14:50:27 +00:00
Giacomand
aceb4b22e1 Removed the icon color blend operations from human's update_icons(). 
Changed all the hair/facial_hair/eye sprites to use a white base.
Changed the preview screen, in the preference menu, to use ICON_MULTIPLY to be able to use the new white sprites.
Removed the unused and broken cloaking item.
Ninjas now use the alpha variable, removed most of the checks for it.
Updated the documentation a bit.
Added some helper procs for later.
 2014-01-16 14:33:50 +00:00
Incoming
03464e1f4d Slime Mob Refactor 
Death of the istype invasion from slimes, previously every single color of slime was its own kind of mob, and every single one of those slimes also had an adult form which was a different mob.

There is now only one kind of slime, reliant on new var is_adult and old var colour to determine how it looks. All baby slimes functioned identically outside of icon and core, and all adult slimes functioned identically to each other and to the babys save for a bit higher Health and more capacity to break shit.

A nice side effect is that this solves any inheritence issues of baby slimes growing up since it's still the same mob, though it doesn't solve the same issues for adult slimes splitting.

Also fixed a few annoying but rare bugs (like getting ghosted because you got DC'd and your slime self split and you weren't around to get mind transfered)
 2014-01-13 19:38:37 -05:00
Malkevin
a8c153a290 A bunch of bug fixes 
-fixed space ninjas not being able to charge directly from power cells - fixes #2139

-'fixed' Distro/Waste Monitors not displaying pressure read out when sensor was reading zero pressure - fixes #
227

-removed the canmove check on camera consoles - fixes #490

-Fixed stealmin's real ckeys showing in the admin-pm reply dialog's title - partially fixes #2163

-Fixed people buckled to chairs not dropping their items when appropriate (like when dead) - fixes #2172

-Fixed people being able to use uplink functions whilst stunned/dead/etc - fixes #2144
 2014-01-11 18:37:31 +00:00
Giacom
c8120da49c Merge pull request #2283 from YotaXP/list2text-refactor 
Optimized and refactored list2text, text2list, and replacetext.
 2014-01-11 10:11:13 -08:00
Perakp
8ba1e8cd33 - Moves spells from the mob to the mind. 
- Construct spells are an exception.
- Spells are transferred whenever a mind is transferred: cloning, pod cloning, borging, staff of changing.
- Spells are not transferred when you create a new mind for a new mob: soul stones, golems, respawns.
- To my surprise, this did not fix the issue where a mind-swapped wizard loses their spells when their original body is destroyed. I do not know why this happens.
- Non-human mobs can't use spells by default. Varedit spell.human_req to do that.
 2014-01-10 15:59:55 +02:00
YotaXP
f98a57b750 Optimized and refactored list2text, text2list, and replacetext. 
Also fixed some grammar in the station blueprint code.
 2014-01-07 22:15:25 -05:00
Aranclanos
42e13b8914 Turfs who spawn with the spawn verb or with buildmode will now use the ChangeTurf() proc and stop making Linda runtime to hell. 2014-01-07 09:19:59 -03:00
Incoming
1e4ef796fd Feature: Adds summon guns and summon magic as fun secrets for badmins 
Bugfix: Prevents people from becoming the survivor multiple times
 2013-12-16 23:29:58 -05:00
Giacomand
ceec829294 Tons of typo fixes and renames Centcomm to Centcom. Manual merge of #1950. 2013-12-13 21:14:23 +00:00
ikarrus
dce8abbd06 Input window will now have the current admin notice displayed when you go edit it. 2013-12-04 08:13:56 -07:00
ikarrus
5f15506e38 Admin Notices 
Lets admins set temporary notices that will last until the end of the round.
* All players that join the server will see this notice.
* Anyone can check it using the Adminnotice verb
* Also adds the motd verb that can be used to check the server's message of the day

The intention of this is to make it easier for admins and server hosts to run special events.
 2013-12-03 22:25:28 -07:00
Emil
b642db40a1 Reverting a change I never did? 2013-12-01 23:30:22 +01:00
Emil
fd61d1f9bd Fixed a mistake in newbanjob.dm 
Accidently removed the href tags from an ingame message earlier.
 2013-12-01 23:26:59 +01:00
Limeliz
7629c5d4a3 I found #1870 in more places. 
Replaced [key_name_admin(usr)] with [key_name(usr)] in all logging, to remove href-tags from logfiles.
 2013-12-01 23:18:59 +01:00
ikarrus
79629fad0c Sets frequency of spec ops officer radios to 144.1 so they can communicate with deathsquads, who are also set to that frequency. 
Mostly for my own conveneience.
 2013-11-21 20:13:42 -07:00
errorage
3537b5ea9a - Added an option to the secrets tab which displays the current list of admins and their ranks. 2013-11-10 02:52:41 +01:00
Giacomand
c27070ff18 Merge branch 'master' of https://github.com/tgstation/-tg-station into pr/1704 
Conflicts:
	maps/tgstation.2.1.2.dmm
 2013-11-08 22:55:23 +00:00
Cheridan
2c4f15bdbd Cleaned up the UI and fixed bugs. 
fixed up the GPS lists.

Added another Telescience area.

Fixed one final bug.

fixed some bugs

fixed a bug

Fixed a fuck ton of Bugs and Issues. Heavy thanks to SuperSayu for helping fix the code, along with Giacom.

Added 2 new Telescience only areas, and gave the BIG BAD BADMINS a investigate log each time someone teleports with Telescience. This logs the destination coordinates and the area it was in.

Fixed some bugs, and set the new stuff on a BRAND NEW 7th Z-LEVEL! Now you guys cant get to it falling out of the shuttle anymore.

Fixed some bugs.

Added Cosmic Anomalies on the empty Z-Level for you to find during Telescience! I also fixed some bugs.

Fixes a bunch of bugs. Don't pull yet, Telescience stuff is on the way!

fixed another issue

Fixed more issues

Fixed issues.

Adds Telescience! It is also added to the map where Misc. Research was.

Merge pull request #1682 from Giacom/active_player_serverstatus

Adds the active players for when you are getting the server status.
 2013-11-08 22:54:34 +00:00
Rockdtben
c11523c093 Remove list_free_slots.dm 2013-11-07 18:19:38 -06:00
Rockdtben
6bdb91a042 The admin tool "List Free Slots" popups now instead of flooding the chat window. 2013-11-07 08:43:19 -06:00
AlexanderUlanH
16d17921f9 Cha-cha-cha-changes 
Changed the shuttle controller to a datum, changed the appearance of the
labor shuttle, and fixed stackers giving one free stack of each ore.
 2013-11-02 17:01:54 -04:00
AlexanderUlanH
87b72833bd Added the labor shuttle 2013-11-02 15:16:39 -04:00
sirbayer
c6c1dbd363 Merge branch 'master' of https://github.com/tgstation/-tg-station into srsbsns-improvedprojectiles 2013-11-01 20:32:04 -07:00
sirbayer
19e51caef0 Modification of .gitignore to include admins.txt. Hopefully.` 
Added myself to admins.txt for testing.

Merge branch 'srsbsns'

Fucking finally figuring out how to make admins.txt be ignored.

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

stuff

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge branch 'master' of https://github.com/tgstation/-tg-station

latest setting for tgstation.dme

deeply do I loathe these files

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

God I hate gitignore

Merge branch 'master' of https://github.com/tgstation/-tg-station

Modification of .gitignore to include admins.txt. Hopefully.`

Added myself to admins.txt for testing.

Merge branch 'srsbsns'

Fucking finally figuring out how to make admins.txt be ignored.

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

stuff

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge branch 'master' of https://github.com/tgstation/-tg-station

latest setting for tgstation.dme

deeply do I loathe these files

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

God I hate gitignore

Merge branch 'master' of https://github.com/tgstation/-tg-station

Modification of .gitignore to include admins.txt. Hopefully.`

Added myself to admins.txt for testing.

Merge branch 'srsbsns'

Fucking finally figuring out how to make admins.txt be ignored.

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

stuff

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge branch 'master' of https://github.com/tgstation/-tg-station

latest setting for tgstation.dme

deeply do I loathe these files

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

God I hate gitignore

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge remote-tracking branch 'remotes/origin/srsbsns-improvedprojectiles' into srsbsns-improvedprojectiles

Conflicts:
	config/admins.txt
	data/investigate/singulo.html

I don't what I'm doing

Massive overhaul to automatic gun functionality, intended primarily to
allow partially-filled magazines to be released.

Now it compiles and doesn't throw runtimes! Also chambering rounds works
right! Unfortunately the contents still need to be looked at, the Russian
Revolver isn't working, and the Bartender's shotgun is just a nightmare.
Also you still can't eject mags.

Mags eject, most gun work. Shotguns still have a problem with reloading
and chambering. Russian Revolver is a bitch.

Heavy finalizing touches. Fixed references to changed trees. Added
icon_states for some magazines. Fixed revolver glitches and subtyped
double-barreled shotguns to revolvers to fix its glitches. Made bullets
and spent shells more obvious via graphical changes. Probably did some
other things but I can't think of what they'd be.

Sprite tweaks for final preparations for pull request.

final FINAL finalizations.

Adding full paths to overwritten procs for simplicity's sake.

Fixing damaged .gitignore and config/admins.txt.

Finalization for pull preparation. Clean up some descs, eliminate data folder.
 2013-10-30 17:56:00 -07:00