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
47,688 Commits 61 Branches 14 Tags
82d2e68b89093c79e577eaebced07baecbfed409
Commit Graph

9034 Commits

Author SHA1 Message Date
Lan
98ed543423 Adds Penguins, and Penguins to Winter Wonderland (#28454) 2017-06-17 09:32:28 -03:00
QualityVan
a7af10eb56 Adds onions (#28414) 2017-06-16 18:22:31 -03:00
Mike Long
3ddef57ecf Vomit fix (#28492) 2017-06-16 17:18:19 -03:00
Jordan Brown
451ab28ed4 Removes delay from AddEmploymentContract 2017-06-15 09:18:43 -04:00
Kyle Spier-Swenson
f46092cda9 Revert "Makes cyborg module change logging not awful" (#28458) 2017-06-14 06:44:39 -05:00
Leo
0a4a7e26c7 Merge pull request #28406 from ChangelingRain/loggingtweak 
Makes cyborg module change logging not awful
 2017-06-13 21:43:13 -03:00
Leo
7ec5c0e5d3 Merge pull request #28255 from optimumtact/revert-28229-revert-28170-observerspeep 
Players cannot observe before PREGAME is reached, Version 2
 2017-06-13 21:42:09 -03:00
Robustin
bfa572b186 Makes Zombies 2 spooky (#27984) 
* stun limit

* Update zombies.dm

* True extent of my laziness revealed

* 4

* moaning

* actual code
 2017-06-13 19:12:18 -05:00
Cruix
13e4f6cf6a Refactored advanced camera consoles (#28360) 
* Updated advanced camera consoles to be more generic

* Renamed /obj/machinery/computer/camera_advanced/proc/EjectUser() to /obj/machinery/computer/camera_advanced/remove_eye_control()
 2017-06-13 15:20:17 +02:00
Jordan Brown
be4a20978d Fixes MC panel Location not working while inside containers (#28368) 
* Fixes MC panel Location not working while inside containers

* No S

* Create mob.dm
 2017-06-13 09:44:58 +02:00
kevinz000
968a384605 Fixes dead PKborgs having active dampener fields (#28214) 
* Create robot_items.dm

* on mob death
 2017-06-13 09:23:18 +02:00
Joan Lung
97f1f81a7f Makes cyborg module change logging not awful 2017-06-12 17:53:38 -04:00
Joan Lung
cf67807d4d Merge pull request #28351 from lzimann/sprites 
Changes all dmis to be lowercase
 2017-06-12 17:33:08 -04:00
oranges
c866a77147 Players cannot observe before PREGAME is reached 
Ready | Not Ready | Observe is now a three way toggle

The player ready status has been refactored into an ENUM of the three
states, READY, NOT_READY and OBSERVING

if the tickerstate is at least PREGAME they will spawn as observers,
before then you can only register your interest in observing.

All the observer code has been centralised into a single
make_me_an_observer proc on new_player mobs
 2017-06-12 20:58:15 +00:00
Joan Lung
a3eb769f1c Merge pull request #28321 from Xhuis/janitor_cyborg_maintenance 
Outfits janitor cyborgs with a screwdriver, crowbar, and floor tiles
 2017-06-12 16:34:10 -04:00
kevinz000
235ebfa1c2 Adds glowing cybernetic eyes to R&D - No functions except for flashlight! (#27941) 
* MY SNOWFLAKE IS TOO STRONG FOR YOU

* rnd design

* Update eyes.dm

* wew

* k

* fix

* ready

* Update eyes.dm

* Update eyes.dm

* updates

* lazylists are shit but whatever

* runtimes funtimes, and case sensitiveness

* cyberbossy

* cyberboss making me break things

* checks for implantation first..

* better

* tested

* dirs

* efficiency

* all gud
 2017-06-12 10:15:57 +02:00
Jordan Brown
4754b68736 Makes arrivals shuttle slightly more juicy (#28254) 2017-06-11 18:27:57 -04:00
Lzimann
3f705c0479 Changes all dmis to be lowercase 2017-06-11 16:05:17 -03:00
Joan Lung
f1f356a290 Merge pull request #28337 from lzimann/files 
Changes all sound files to be lower case, plus standardizes their references
 2017-06-11 14:50:41 -04:00
Joan Lung
ed53f81dd4 Cogscarabs will now visually flip over when stunned (#28297) 
* Cogscarabs will now visually flip over when stunned

* wiggle!
 2017-06-11 01:38:22 -05:00
Lzimann
3e34eb9e3f Changes all sounds to be lower case, plus standardizes their references 2017-06-11 00:38:45 -03:00
Xhuis
736bda8f32 Outfits janitor cyborgs with maintenace tools 2017-06-10 18:12:52 -04:00
octareenroon91
c3cca6745c MMI-in-mecha can use the mecha tools again (#28280) 2017-06-10 15:49:21 -03:00
ShizCalev
d46b1f7a09 Fixes basic spiderlings becoming ice spiders (#28262) 
* fix

fixes #14242

* refactors ice spiders into giant_spiders.dm
 2017-06-10 19:22:34 +02:00
Leo
25ab919a6f Merge pull request #28240 from Shadowlight213/brainnoclonecheck 
Makes dismembered heads and brains respect NOCLONE
 2017-06-09 22:07:59 -03:00
Leo
1699b98f76 Merge pull request #28218 from optimumtact/hamish_the_cow_gets_brushed 
Some other code now uses ai status display list
 2017-06-09 11:28:22 -03:00
bgobandit
93953835f6 You can no longer mount borgs while stunned. (#28198) 2017-06-08 19:16:55 -03:00
ShizCalev
f2d829261a [Typo] Duffel Bag (#28200) 2017-06-08 19:16:20 -03:00
oranges
dfef4d93ea Some other code now uses ai status display list 2017-06-08 21:16:58 +00:00
Jordan Brown
23eb6e4aec Merge upstream 2017-06-08 16:30:35 -04:00
Shadowlight213
16d4171230 Makes dismembered heads and brains respect NOCLONE 2017-06-08 13:07:31 -07:00
Jordan Brown
93e3fa18a2 Revert "Players cannot observe before PREGAME is reached" 2017-06-08 13:04:58 -04:00
Jordan Brown
f4ffde7a09 Merge branch 'master' of https://github.com/tgstation/tgstation into goonchatv3 2017-06-08 12:54:27 -04:00
Leo
fbf9f42a5d Merge pull request #28170 from optimumtact/observerspeep 
Players cannot observe before PREGAME is reached
 2017-06-08 12:09:31 -03:00
Leo
78e6b1af75 Merge pull request #28185 from Cyberboss/patch-111 
Fixes ghosts not returning an initialize hint
 2017-06-08 11:44:58 -03:00
Leo
d95dc7413c Removes xeno queen maid (#28171) 2017-06-08 13:32:08 +02:00
oranges
507ee7f223 Players cannot observe before PREGAME is reached 
Ready | Not Ready | Observe is now a three way toggle

The player ready status has been refatored into an ENUM of the three
states, READY, NOT_READY and OBSERVING

if the tickerstate is at least PREGAME they will spawn as observers,
before then you can only register your interest
 2017-06-08 06:46:38 +00:00
oranges
7da58ff009 Removes the headpatting code and the slapping code (#28028) 2017-06-07 22:55:14 -03:00
Joan Lung
f069ec979c Merge pull request #28162 from Expletive/soundbang 
Refactors soundbang_act to use adjustEarDamage
 2017-06-07 20:25:36 -04:00
Jordan Brown
5bbbd26739 Merge branch 'master' into goonchatv3 2017-06-07 20:06:46 -04:00
Expletive
12d522dbc0 Organs for catgirls (#28148) 2017-06-07 16:15:33 -03:00
Jordan Brown
08d21fd1aa Fixes ghosts not returning an initialize hint 2017-06-07 09:56:21 -04:00
Expletive
8413960d8e A large and unasked for repath and improvement of accessories (formerly ties, but actually armbands and medals) (#28115) 2017-06-06 22:26:56 -03:00
Expletive
12092620ab make readable 2017-06-06 18:12:55 -07:00
Expletive
e34cf1445f Make it work the same 2017-06-06 17:07:43 -07:00
Expletive
0de059e60b Soundbangs use AdjustEarDamage 2017-06-06 17:02:38 -07:00
Jordan Brown
b8094b48f3 Fixes logged out spawning new_players (#28105) 2017-06-06 15:27:27 -03:00
Jordan Brown
ccfaf07a5a Merge branch 'goonchatv3' of https://github.com/Cyberboss/tgstation; branch 'master' of https://github.com/tgstation/tgstation into goonchatv3 2017-06-06 09:18:44 -04:00
Leo
30863f29d6 Merge pull request #28064 from ChangelingRain/hierophanttweak 
When murdering mining mobs, the Hierophant will ignore legion skulls
 2017-06-05 15:26:07 -03:00
Joan Lung
9f9d1ff2e1 Cogscarabs can no longer use guns (#28066) 2017-06-05 15:22:49 -03:00