cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-31 00:58:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
36,212 Commits 72 Branches 14 Tags
ee3ce06a506dfd0ffec8eabfc4d4b4379b012b44
Commit Graph
36212 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jack Edge ee3ce06a50 Merge branch 'master' into template-checking 2016-06-23 22:39:49 +01:00
orangesandGitHub ca5a7f50c7 Merge pull request #18837 from SnipeDragon/dev2 
Guest keys no longer trigger findJoinDate (Fixes #18749)
 2016-06-24 09:34:25 +12:00
orangesandGitHub df8150a752 Merge pull request #18834 from Niknakflak/ShuttleFix 
Fixes Shuttle bar bugs I caused
 2016-06-24 09:33:44 +12:00
sybil-tgstation13 67cc8f51b2 Automatic changelog compile, [ci skip] 2016-06-23 19:00:19 +00:00
bawhoppenandKorPhaeron 40f68a409f fixes magnet (#18867) 2016-06-23 11:52:52 -04:00
tgstation-server e77a2b807f Automatic changelog generation for PR #18827 [ci skip] 2016-06-23 10:52:23 +00:00
JordieandGitHub 3a15ae06e4 Merge pull request #18827 from ChangelingRain/extremelybelligerenteye 
You can't place ocular wardens within the damage range of other ocular wardens
 2016-06-23 20:52:21 +10:00
tgstation-server 8850a390d8 Automatic changelog generation for PR #18826 [ci skip] 2016-06-23 10:49:21 +00:00
JordieandGitHub 3b9731645e Merge pull request #18826 from ChangelingRain/normalfloors 
Clockwork floors now only heal toxin damage on servants of Ratvar
 2016-06-23 20:49:19 +10:00
orangesandGitHub ddaeb722ca Merge pull request #18810 from coiax/vital-changes 
Butterflies and cats
 2016-06-23 15:07:06 +12:00
tgstation-server 2152a01a7d Automatic changelog generation for PR #18793 [ci skip] 2016-06-23 02:27:51 +00:00
orangesandGitHub 1092ed678d Merge pull request #18793 from coiax/ghosts-in-space 
Ghosts can click to use transition space turfs
 2016-06-23 14:27:50 +12:00
orangesandGitHub 58b942fd88 Merge pull request #18853 from tgstation/revert-18840-master 
Revert "Pope Quick-fix"
 2016-06-23 13:24:55 +12:00
KorPhaeronandGitHub 4f760d0ae3 Revert "Pope Quick-fix" 2016-06-22 20:37:12 -04:00
tgstation-server 25c6b1be72 Automatic changelog generation for PR #18813 [ci skip] 2016-06-23 00:17:57 +00:00
coiaxandKorPhaeron 6a593e9491 Puts some safety grilles around the main shard (#18813) 
HUGBOX STATION 2016

🆑 coiax
rscadd: Due to safety concerns, the Hyperfractal Gigashuttle
now has some safety grilles to prevent accidental matter energising.
/🆑
 2016-06-22 19:17:56 -05:00
Joan LungandKorPhaeron e6efbdf88f Cogscarab storage is no longer painted cardboard (#18821) 2016-06-22 18:48:36 -05:00
Joan LungandKorPhaeron ab0e354775 Clockwork treads are no longer NOSLIP (#18828) 2016-06-22 18:47:01 -05:00
tgstation-server 54cc91d0bb Automatic changelog generation for PR #18829 [ci skip] 2016-06-22 23:46:47 +00:00
Joan LungandKorPhaeron b97f9f154b Ratvar's Flame is no longer a good melee weapon (#18829) 2016-06-22 18:46:45 -05:00
Joan LungandKorPhaeron 1e78916458 Invoking Sevtug is somewhat less obscenely powerful (#18831) 2016-06-22 18:46:05 -05:00
Jack Edge dc7c591748 Code review 2016-06-23 00:40:28 +01:00
Jack Edge 5f9553163c Butterflies and cats 
- Butterflies now "flutter" rather than say
- Admins have gained Admin->Secrets->Fun->Mass Purrbation
- Plus new cat sound effect.
 2016-06-23 00:37:15 +01:00
Jack Edge 7c0f7c02ec Ghosts can click to use transition space turfs 
🆑
rscadd: If you are an observer, you can click on transition edges of a
Z-level in order to move as a mob would.
/🆑

Also removed some trailing returns.
 2016-06-23 00:36:21 +01:00
tgstation-server 2c2f6fc07d Automatic changelog generation for PR #18677 [ci skip] 2016-06-22 22:06:52 +00:00
orangesandGitHub 8b29e3e049 Merge pull request #18677 from coiax/cellular-emporium 
Changling evolution menu becomes cellular emporium
 2016-06-23 10:06:51 +12:00
orangesandGitHub 81da43bdc5 Merge pull request #18790 from tgstation/RemieRichards-disappointed 
Venus human trap changes
 2016-06-23 10:05:39 +12:00
Incoming5643andKorPhaeron b622d10ecb Fixes three problems of my own identification/invention (#18824) 
* Fixes three problems of my own identification/invention
1. Fixes meaty ores spawning with invisible "snack" meats
2. Fixes easyattachment limbs remaining in your hand sometimes
3. Mirrors the fix of all ghost role sleepers being exclusively male from my other, less mergable pr.

* I failed a spot check
 2016-06-22 17:03:09 -05:00
Incoming5643andKorPhaeron f04cf8595a Revert "Puts the AI in its place" (#18809) 2016-06-22 16:26:10 -05:00
orangesandGitHub df8e062ed0 Merge pull request #18835 from Jordie0608/theysaidthisdaywouldnevercometheysaidthiswouldallbeover 
Adds changelog reminder to pull requests
 2016-06-23 09:23:25 +12:00
tgstation-server 36fb46981c Automatic changelog generation for PR #18484 [ci skip] 2016-06-22 21:12:49 +00:00
orangesandGitHub 0432cd9bb4 Merge pull request #18484 from coiax/random-space 
All of space is now randomised
 2016-06-23 09:12:48 +12:00
tgstation-server 1df035b140 Automatic changelog generation for PR #18808 [ci skip] 2016-06-22 21:12:12 +00:00
Joan LungandKorPhaeron 8c87be8735 Spatial Gateways will last twice as long (#18808) 
* Spatial Gateways will last slightly longer

* no slabs
 2016-06-22 16:12:10 -05:00
Jack Edge e1943df2c8 Finally finishes whiteship_meta 2016-06-22 22:04:22 +01:00
tgstation-server 494afdc4c1 Automatic changelog generation for PR #18804 [ci skip] 2016-06-22 21:02:47 +00:00
Joan LungandKorPhaeron 619543d9c2 Smacks clockwork component generation in the face again (#18804) 2016-06-22 16:02:46 -05:00
Jack Edge 423f17c571 Repaths a bunch of plants 2016-06-22 21:15:44 +01:00
Jack Edge c44ff9b897 Fixes ALL OF THE TEMPLATES 2016-06-22 20:54:28 +01:00
Jack Edge 676106ba92 Travis now checks templates 2016-06-22 20:53:24 +01:00
tgstation-server 4872623507 Automatic changelog generation for PR #18723 [ci skip] 2016-06-22 16:24:46 +00:00
CheridanandGitHub a6fc773540 Merge pull request #18723 from coiax/pond-skipping 
Adds visible ripples indicating shuttle's transit
 2016-06-22 11:24:44 -05:00
Joan LungandGitHub 220cf636a3 Merge pull request #18840 from sawu-tg/master 
Pope Quick-fix
 2016-06-22 11:23:31 -04:00
SawuandGitHub 48221bdf2f FIXES DA POPEY.. I HOPEY. 2016-06-23 01:16:37 +10:00
SawuandGitHub a12373e0bb Pope Fix Pt.2 2016-06-23 01:09:56 +10:00
SawuandGitHub cfd478eb79 Pope Fix Pt.1 2016-06-23 01:05:18 +10:00
tgstation-server ecc7c5855c Automatic changelog generation for PR #18801 [ci skip] 2016-06-22 13:06:15 +00:00
Joan LungandGitHub 321e1d52f7 Merge pull request #18801 from sawu-tg/master 
Pope of Sin Update
 2016-06-22 09:06:12 -04:00
Sawu 9463880ed8 Renames the initTemplateZLevel function to initTemplateBounds 2016-06-22 22:56:07 +10:00
Sawu d005399dce Reverting z2.dmm to master. 2016-06-22 22:46:10 +10:00