cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

solving conflict

Browse Source
This commit is contained in:
DeityLink
2014-11-27 06:47:56 +01:00
parent 8911b1bf1b 56ba91f35f
commit cbfd4ec08a
19 changed files with 206 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/game/dna/genes/goon_powers.dm
View File

@@ -256,6 +256,9 @@
return
var/atom/movable/the_item = targets[1]
if(!the_item.Adjacent(usr))
revert_cast(usr)
return
if(ishuman(the_item))
//My gender
var/m_his="his"

2
code/game/gamemodes/gameticker.dm
View File

@@ -365,7 +365,7 @@ var/global/datum/controller/gameticker/ticker
spawn
declare_completion()
if(config.map_voting)
vote.initiate_vote("map","The Server")
vote.initiate_vote("map","The Server", popup = 1)
spawn(50)
if (mode.station_was_nuked)

4
code/game/gamemodes/scoreboard.dm
View File

@@ -337,7 +337,9 @@
if(-499 to -250) score["rating"] = "A Wretched Heap of Scum and Incompetence"
if(-249 to -100) score["rating"] = "Outclassed by Lab Monkeys"
if(-99 to -21) score["rating"] = "The Undesirables"
if(-20 to 20) score["rating"] = "Ambivalently Average"
if(-20 to -1) score["rating"] = "Not So Good"
if(0) score["rating"] = "Nothing of Value"
if(1 to 20) score["rating"] = "Ambivalently Average"
if(21 to 99) score["rating"] = "Not Bad, but Not Good"
if(100 to 249) score["rating"] = "Skillful Servants of Science"
if(250 to 499) score["rating"] = "Best of a Good Bunch"