cyberpresidentvanellope/fulpstation
1
0
Fork 0
mirror of https://github.com/fulpstation/fulpstation.git synced 2025-12-10 10:01:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
36,273 Commits 2 Branches 11 Tags
c374782ebf187979d4b45e54c62a35688e82690f
Commit Graph

16755 Commits

Author SHA1 Message Date
Jack Edge
c374782ebf A lot of shuttle changes 2016-06-25 17:28:46 +01:00
Jack Edge
201da77121 Fixing some bugs with sparkles 2016-06-25 16:51:19 +01:00
Jack Edge
27d6c284ed Merge branch 'fun-balloon' into shuttle-processing 
Conflicts:
	_maps/shuttles/emergency_bar.dmm
	_maps/shuttles/emergency_narnar.dmm
	code/modules/spells/spell_types/wizard.dm
 2016-06-25 16:26:22 +01:00
oranges
a90a23134d Merge pull request #18876 from ChangelingRain/stablemine 
Stabilizing Serum is named properly in the mining vendor
 2016-06-25 17:34:43 +12:00
oranges
9427c39155 Merge pull request #18872 from ChangelingRain/poolorgib 
Pools several unpooled overlay/temp objects
 2016-06-25 17:34:30 +12:00
Cheridan
22e370b8b7 Merge pull request #18866 from Jordie0608/idkwhythiswasntathingalreadyicanthinkofareasonwhynot 
Adds edit to job tempbans
 2016-06-24 13:26:38 -05:00
Cheridan
cf437557e3 Merge pull request #18865 from ChangelingRain/stunborg 
Flashes now once again stun borgs
 2016-06-24 13:01:46 -05:00
AnturK
b6a715a366 Merge pull request #18862 from MrPerson/reminder_to_vote_in_brexit_britfags 
Fixes mechs breaking lights by walking onto them
 2016-06-24 11:57:45 +02:00
oranges
2782f7fdfa Merge pull request #18836 from SnipeDragon/master 
Mice now retain custom names on death.  ( Issue #18786 )
 2016-06-24 20:15:32 +12:00
oranges
41e3acc71d Merge pull request #18820 from Xhuis/the_pinnacle_of_deception_technology 
Adds cardboard cutouts
 2016-06-24 20:14:59 +12:00
SnipeDragon
04da1c08b3 Fixed for custom placed mice. 2016-06-23 23:24:03 -05:00
Joan Lung
b374e26b91 Stabilizing Serum is named properly in the mining vendor 2016-06-23 22:58:18 -04:00
Joan Lung
b13d7f86af Pools several unpooled overlay/temp objects 2016-06-23 20:50:36 -04:00
Joan Lung
91a7632d9d no module unequip 2016-06-23 20:00:58 -04:00
oranges
8183eb1e9f Merge pull request #18847 from Shadowlight213/botclosefix 
Fixes bot interfaces reopening for all previous users.
 2016-06-24 10:07:49 +12:00
oranges
ca5a7f50c7 Merge pull request #18837 from SnipeDragon/dev2 
Guest keys no longer trigger findJoinDate (Fixes #18749)
 2016-06-24 09:34:25 +12:00
bawhoppen
40f68a409f fixes magnet (#18867) 2016-06-23 11:52:52 -04:00
Jordie
92305ddb62 adds edit to job tempbans 2016-06-23 23:23:27 +10:00
Joan Lung
d0d6e8d6f7 Flashes now once again stun borgs 2016-06-23 08:52:11 -04:00
MrPerson
df637898ef Fixes mechs breaking lights by walking onto them 
Fixes #17271
 2016-06-23 02:51:55 -07:00
oranges
ddaeb722ca Merge pull request #18810 from coiax/vital-changes 
Butterflies and cats
 2016-06-23 15:07:06 +12:00
Joan Lung
e6efbdf88f Cogscarab storage is no longer painted cardboard (#18821) 2016-06-22 18:48:36 -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
oranges
8b29e3e049 Merge pull request #18677 from coiax/cellular-emporium 
Changling evolution menu becomes cellular emporium
 2016-06-23 10:06:51 +12:00
oranges
81da43bdc5 Merge pull request #18790 from tgstation/RemieRichards-disappointed 
Venus human trap changes
 2016-06-23 10:05:39 +12:00
Incoming5643
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
oranges
0432cd9bb4 Merge pull request #18484 from coiax/random-space 
All of space is now randomised
 2016-06-23 09:12:48 +12:00
Shadowlight213
e72b96b4d1 Fixes bots not removing a user from the users list on closing the interface. 2016-06-22 12:24:21 -07:00
Cheridan
a6fc773540 Merge pull request #18723 from coiax/pond-skipping 
Adds visible ripples indicating shuttle's transit
 2016-06-22 11:24:44 -05:00
SnipeDragon
ef2bb16777 findJoinDate only procs if a client is not a Guest and the DB is connected. As Jordie requested. 2016-06-22 06:33:32 -05:00
SnipeDragon
8bdf81ff84 Guest keys no longer trigger findJoinDate (Fixes #18749) 2016-06-22 06:00:21 -05:00
SnipeDragon
4e6402e3fb Coding standards fix. 2016-06-22 05:07:40 -05:00
SnipeDragon
2f858d7426 Merge branch 'master' of github.com:SnipeDragon/tgstation 2016-06-22 04:45:59 -05:00
SnipeDragon
f2ee254096 Consistency fix for Issue #18786 2016-06-22 04:43:05 -05:00
Faltnor
d950565a3f Make Staff of Honkmother slightly less OP (#18802) 
Just reducing the stun on it a smidgen so it doesn't stun like a rapid fire stun gun.
 2016-06-22 03:23:05 -05:00
Cheridan
7ab8f8772f Merge pull request #18794 from KorPhaeron/durkel 
Adds missing return to boss loot
 2016-06-21 23:13:49 -05:00
Cheridan
dbf467136f Merge pull request #18830 from MMMiracles/a_skele-ton 
Fixes Invisible Skeletons
 2016-06-21 23:10:56 -05:00
oranges
4bc99d1b2e Merge pull request #18798 from Niknakflak/AngelAI 
Adds the Angel AI Core sprite to the game
 2016-06-22 15:50:37 +12:00
MMMiracles
d3e183a4d4 do the skeleton 2016-06-21 22:55:11 -04:00
oranges
b85862f070 Merge pull request #18785 from Incoming5643/patch-12 
Fixes Infinitely Generating Exotic Blood
 2016-06-22 12:32:23 +12:00
oranges
ca7067eded Merge pull request #18741 from KorPhaeron/tacticalespionageaction 
Tactical Espionage Action
 2016-06-22 12:08:05 +12:00
Xhuis
369ad867de Adds cardboard cutouts 2016-06-21 17:57:53 -04:00
oranges
6b1ba6adec Merge pull request #18767 from ChangelingRain/legiondoor 
Fixes legion door alert
 2016-06-22 09:51:06 +12:00
Jack Edge
120810316e Merge branch 'master' into cellular-emporium 2016-06-21 22:32:01 +01:00
oranges
12b8b1a9b2 Merge pull request #18735 from coiax/emergency-drone 
Adds Drone Shells to Emergency cargo packs
 2016-06-22 09:04:13 +12:00
Joan Lung
44875e7fd4 Fixes holoparasites spamming messages while taking negative damage (#18774) 2016-06-21 10:57:07 -05:00
Cheridan
8003b631ac Merge pull request #18761 from ChangelingRain/alloygain 
Scarab proselytizers reap more alloy from metal and plasteel and can now reap alloy from rods directly
 2016-06-21 10:09:43 -05:00
Joan Lung
8c8c69c8ac Merge pull request #18714 from coiax/fridge-magnet 
Station rename logging, admin reject button
 2016-06-21 08:46:17 -04:00
Jack Edge
3e30473365 Applied MSO's proposed changes 2016-06-21 13:34:36 +01:00