cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-27 01:21:30 +00:00
Code Issues Packages Projects Releases Wiki Activity
36,032 Commits 61 Branches 14 Tags
01d4d02b702a1cdc49bd9561368ac5df8a8bc3dd
Commit Graph

16667 Commits

Author SHA1 Message Date
PKPenguin321
01d4d02b70 conflicts + undo loc changes 
attackself/dragging the board now deletes it and spawns a new board of the proper type again instead of setting locs
 2016-06-20 22:22:50 -07:00
Cheridan
0287abf2dc Borgs now get less confused over time! 2016-06-20 23:55:13 -05:00
Cheridan
4dd56dfbb7 Merge pull request #18738 from pudl/ka-desc 
Improves the KA description
 2016-06-20 17:12:42 -05:00
oranges
46bbb4b615 Merge pull request #18728 from coiax/spawn-removal-2 
Removes spawn() from some more slime reactions
 2016-06-21 09:57:07 +12:00
oranges
6ddd748fb2 Merge pull request #18726 from coiax/spawn-removal-1 
Removes spawn() from things I
 2016-06-21 09:56:38 +12:00
Joan Lung
f3043b3386 Cogscarabs have the proper dead icon (#18759) 
* Cogscarabs have the proper dead icon

* replace deconflict
 2016-06-20 15:55:36 -05:00
Xhuis
3e890997f9 Welding fuel hotfix (#18773) 2016-06-20 14:05:11 -05:00
Cheridan
e4b73d3aae Merge pull request #18739 from ChangelingRain/camocost 
Nuke ops can no longer get free noslips with their camo kit
 2016-06-20 11:37:51 -05:00
pudl
f459865be7 Improvements 2016-06-20 05:51:40 -05:00
Kyle Spier-Swenson
0d6bbbb412 stop the pills (#18703) 
* RedPills Processing

Now you have to use START_PROCESSING(SSname, thing) (and STOP_PROCESSING)

* Fixes a minor bug.
 2016-06-20 12:07:44 +02:00
Xhuis
c81d5fc354 Clockwork cult antagonist creation and job bans (#18730) 
* Clock cult creation and jobbans

* Admin creation objective description failsafe

* Failsafe, for real this time
 2016-06-20 08:27:57 +02:00
oranges
b43afb8209 Merge pull request #18721 from KorPhaeron/yellingatotherservers 
Allows basil and sybil captains to yell at eachother
 2016-06-20 11:41:43 +12:00
oranges
bce99c4f58 Merge pull request #18668 from coiax/dropdel 
Adds DROPDEL flag; items will qdel() on dropped()
 2016-06-20 11:08:31 +12:00
oranges
72371fcdc7 Merge pull request #18693 from Core0verload/list_overhead 
Reduces list init overhead a tiny bit
 2016-06-20 10:59:48 +12:00
oranges
23a792213a Merge pull request #18632 from Cheridan/hardcounter 
Changes flashes vs. borgs
 2016-06-20 10:57:34 +12:00
oranges
9d2d092847 Merge pull request #18658 from coiax/fix-18389 
Bar tables now shuttle rotate properly
 2016-06-20 08:18:48 +12:00
oranges
448e386ac4 Merge pull request #18649 from Xhuis/my_eyes_have_seen_that_which_cannot_be_comprehended 
Reagent tank optimization
 2016-06-20 08:18:33 +12:00
oranges
7dc92e3f98 Merge pull request #18647 from TechnoAlchemisto/I_was_lucky_if_papa_went_for_me_first_because_then_at_least_I_would_be_too_disoriented_to_realize_what_he_was_doing_to_sis 
Adds hard cider to the bar.
 2016-06-20 08:18:05 +12:00
oranges
d6bdeb7124 Merge pull request #18455 from Incoming5643/no_bones_about_it 
Mutantrace specflag omnibus
 2016-06-20 08:15:34 +12:00
Joan Lung
20860f2d6a Merge pull request #18646 from Cruix/languages_split 
Splits languages into languages_spoken and languages_understood.
 2016-06-19 15:23:38 -04:00
unknown
f052ce679b Fixed compile error 2016-06-19 15:13:16 -04:00
unknown
4b396a52e7 Resolved conflicts 2016-06-19 15:07:36 -04:00
coiax
961a6c4c26 Adds potted plants to cargo packs (#18662) 
🆑 coiax
rscadd: Potted plants can now be ordered from cargo.
/🆑
 2016-06-19 14:05:18 -05:00
Cheridan
06d8cf8491 Merge pull request #18718 from AnturK/buncha_fixes 
Minor fixes
 2016-06-19 12:31:58 -05:00
Joan Lung
a9d4aa50c4 Nuke ops can no longer get free noslips with their camo kit 2016-06-19 11:41:42 -04:00
Joan Lung
b941a47a60 Adds cogscarabs to clock cult (#18685) 
* Adds cogscarabs to clock cult

* playstyle string

* info

* oh good going

* no static

* delay it eating all the metal

* scarab removal service

* cog

* ree

* error handling

* todo: languages = RATVAR

* isclockmob

* very large box

* faintly glowing eyes
 2016-06-19 17:26:35 +02:00
pudl
5e5fd06207 Improves the KA description 2016-06-19 08:41:00 -05:00
AnturK
1e51270078 Use RANGE_TURFS 2016-06-19 14:38:08 +02:00
Jack Edge
81a4e188bc Code review 2016-06-19 10:15:26 +01:00
Jack Edge
e33692b1c1 Removes spawn() from things I 
- Removes from Sin of Greed slot machine (also cleans up the visible
message to make a difference between viewer and user)
- Removes from ferry request cooldown
- Removes from knock opening doors and closets
 2016-06-19 01:06:51 +01:00
Jack Edge
b16a03e9a8 Removes spawn() from some more slime reactions 2016-06-19 01:01:43 +01:00
Incoming5643
6ad190d867 Spotcheck 2016-06-18 19:53:30 -04:00
Xhuis
1e4901c1f2 Another grammar tweak 2016-06-18 19:48:20 -04:00
Xhuis
5140f3d627 Refactors based on feedback 2016-06-18 19:39:25 -04:00
Incoming
e33dd6dc70 Merge branch 'master' of https://github.com/tgstation/-tg-station into no_bones_about_it 
# Conflicts:
#	icons/mob/actions.dmi
 2016-06-18 18:57:17 -04:00
Incoming
64c829bd1f Fixes poited out errors and spelling mistakes 
the floral suppository now mutates pod people
adds a proper icon for limb regeneration
slime people can't consume their own head
 2016-06-18 18:42:39 -04:00
KorPhaeron
8c96d9a37b Yelling at other servers 2016-06-18 13:52:07 -05:00
AnturK
48df887fad Fixes #17701 2016-06-18 19:22:59 +02:00
Cheridan
9c59db6cd0 Merge pull request #18659 from MrStonedOne/patch-217 
fixes ghost vv.
 2016-06-18 11:30:48 -05:00
unknown
b12398e9fc Resolved conflicts. 2016-06-18 12:17:00 -04:00
Cheridan
4e4f394a60 Merge pull request #18674 from tgstation/RemieRichards-わたしのなまえはレミエです 
Fixes Anime Names
 2016-06-18 11:14:31 -05:00
Cheridan
caf6352581 Merge pull request #18675 from coiax/plz-no-i-have-a-drone-family 
Drones have the silicon faction by default
 2016-06-18 11:09:32 -05:00
Cheridan
6031ce1bab Merge pull request #18676 from Xhuis/cherry_bombs_again_kappa 
Ambrosia gaia balancing
 2016-06-18 11:02:59 -05:00
oranges
eaa85a4931 Merge pull request #17069 from MrStonedOne/XKeyscore 
Automatic Proxy Detection
 2016-06-19 01:17:59 +12:00
AnturK
7237a3effc Fixes #18035 2016-06-18 12:42:13 +02:00
Jordie
47c184bd41 Merge pull request #18656 from Niknakflak/MewMew 
Adds the catghost to donator's special ghosts
 2016-06-18 19:53:47 +10:00
oranges
24eb2c81ac Merge pull request #18690 from KorPhaeron/fulton_patch 
[s]Missing return added to fultons
 2016-06-18 14:43:12 +12:00
c0
0abc91c59d slot_equipment_priority no longer contributes to list init overhead 2016-06-18 05:09:15 +03:00
c0
1311fb9b43 Reduces list overhead a tiny bit 2016-06-18 04:38:49 +03:00
KorPhaeron
c082b7df5a Missing return added to fultons 2016-06-17 19:08:41 -05:00