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
13,483 Commits 2 Branches 11 Tags
97a65cfb046a044de8582a99d9a9dea4cc0d031f
Commit Graph

10873 Commits

Author SHA1 Message Date
JJRcop
97a65cfb04 Changes Shoot() in magicarp to be forwards compatible 2014-09-14 16:07:54 -04:00
JJRcop
7b0306f7b1 Moved magicarp ammo reroll to new carp called "chaos magicarp", which has 75 health and a 5% chance to spawn instead of a normal magicarp 2014-09-10 14:20:03 -04:00
JJRcop
6bc47e8369 Magicarp now fires a random projectile each time, instead of the same one randomized on New() 
Magicarp now randomizes from typesof(initial(projectiletype)) instead of from typesof(/obj/item/projectile/magic) to allow future carps that inherit it to fire whatever they want without changing the code
 2014-09-09 19:07:44 -04:00
Cheridan
cb834f6f29 Merge pull request #4746 from kyrahabattoir/goodbyeRussian 
Because aparently we can't have nice things.
 2014-09-09 12:51:20 -05:00
Cheridan
d2bfc9c60a Merge pull request #4716 from Incoming5643/clownship 
[Map] Makes the clown ship entirely out of bananium
 2014-09-09 08:29:18 -05:00
KyrahAbattoir
20d9e6c2b2 Because aparently we can't have nice things. 2014-09-08 17:26:28 +02:00
Cheridan
89aebe05b9 Merge pull request #4699 from Ikarrus/sscargo 
Adds Space Suit Crate to cargo
 2014-09-08 06:58:28 -05:00
Orange Borg
0e05203e1a Don't tell GIA 
2fast goofball
 2014-09-08 15:55:04 +12:00
Cheridan
db177765eb Merge pull request #4736 from phil235/DrillMsgFix 
fix for mob drilling message
 2014-09-07 22:42:29 -05:00
Cheridan
cd34be6151 Merge pull request #4521 from Incoming5643/summonevents 
Magic Mania $1.75: Summon events
 2014-09-07 22:34:26 -05:00
Cheridan
7750a2baae Merge pull request #4525 from GunHog/HUDS_For_All 
Silicon Medical and Security HUDs!
 2014-09-07 20:01:12 -05:00
Cheridan
866dbb7959 Merge pull request #4634 from Carn/timSort 
TimSort for byond
 2014-09-07 19:52:02 -05:00
phil235
3a12a4bfe8 fix for mob drilling message 2014-09-08 02:34:14 +02:00
Cheridan
0d1b47eaec Merge pull request #4627 from Aranclanos/pipenetsandpipestwo 
Pipes and pipenets
 2014-09-07 19:12:16 -05:00
Cheridan
903b0c9991 Merge pull request #4704 from Ikarrus/minorhuehuehue 
Added some <BR>s to Minor Announcements
 2014-09-07 16:58:48 -05:00
Incoming
6f43bc7bcb Makes the ship airless again 
Color = "#FFFF00"'s all components of the ship proper that can't be made out of bananium to simulate the experience
 2014-09-07 14:40:54 -04:00
Cheridan
6bde58d70d Merge pull request #4702 from Miauw62/sleepen 
Balance changes to the sleepy pen.
 2014-09-07 10:38:00 -05:00
Cheridan
ec7b0bb76f Merge pull request #4681 from Incoming5643/SMESroom 
[MAP] Moves the SMESiesae
 2014-09-07 10:06:13 -05:00
Alex
8f81a0e766 Merge pull request #4709 from Lo6a4evskiy/2014-08-15-Welding-stuff 
Removed unnecessary messages when welding
 2014-09-07 15:08:01 +01:00
Alex
4b68902554 Merge pull request #4678 from Ikarrus/turretcontrolicon 
New icon for Turret Control Panels
 2014-09-07 15:05:38 +01:00
Alex
b7aad470a0 Merge pull request #4705 from Ikarrus/humanmasterrace 
Config Option to Bar Lizards from Authority Roles
 2014-09-07 15:02:45 +01:00
Incoming
2056389ccc Merge branch 'master' of https://github.com/tgstation/-tg-station into SMESroom 
Conflicts:
	_maps/map_files/tgstation.2.1.3.dmm
 2014-09-06 15:49:35 -04:00
Alex
574d5248d4 Merge pull request #4600 from Menshin/2Spooky5Playing 
Fixes skeletons unable to play xylophone on their ribcage
 2014-09-06 19:13:50 +01:00
Alex
9d2e1ffafd Merge pull request #4630 from Ikarrus/nukeopsetup 
Nuke Ops Update
 2014-09-06 19:10:38 +01:00
Alex
c854ef6667 Merge pull request #4703 from Ikarrus/beepboopiamthelaw 
Securitrons will only arrest unidentifiable persons when ID check is on
 2014-09-06 19:10:07 +01:00
Alex
7a9aeaf15f Merge pull request #4711 from Ikarrus/consistentwelds 
Consistent welding sounds
 2014-09-06 19:08:53 +01:00
Alex
4ee5afe5a0 Merge pull request #4700 from Ikarrus/syndicatecrate 
Adds high-end Syndicate crate to cargo
 2014-09-06 19:08:35 +01:00
Alex
8fff1aa0c7 Merge pull request #4701 from phil235/goldschlagerfix 
fixing the icon of goldschlager glass
 2014-09-06 19:08:02 +01:00
Alex
5e367a0e37 Merge pull request #4635 from Jordie0608/petitiontobanaranfromaranfrommakingmemos 
Logging to add/remove memo
 2014-09-06 19:07:54 +01:00
Alex
f2fa83c05b Merge pull request #4675 from Aranclanos/ninjamask 
Removes ninja mask modes.
 2014-09-06 19:07:01 +01:00
Alex
0ade87d365 Merge pull request #4657 from Ikarrus/betterantagscaling 
Improved Antagonist Scaling
 2014-09-06 19:06:04 +01:00
Alex
368b8b199b Merge pull request #4682 from Menshin/reagents_consumption_fix 
Fixes reagents extra consumption + some cleanup
 2014-09-06 19:05:42 +01:00
Alex
62a7596270 Merge pull request #4686 from Miauw62/idfix 
Worn ID won't display on station-bounced broadcasts.
 2014-09-06 19:04:59 +01:00
Alex
0a15a88bf8 Merge pull request #4692 from Ikarrus/destroyscale 
Destroy Objective Probability scales with population
 2014-09-06 19:04:47 +01:00
Alex
53e7981a98 Merge pull request #4698 from Ikarrus/roundendreportbugs 
Fixes Round-End report bugs
 2014-09-06 19:04:27 +01:00
Incoming
fe5d0fbc62 Fixes Map Merge Conflicts (hopefully) 2014-09-06 12:58:57 -04:00
ikarrus
93d7aa68c2 Consistent welding sounds 
Starting a weld job will always play welder.ogg
Finishing a weld job will always play welder2.ogg

Closets and airlocks were backwards.
 2014-09-06 10:06:17 -06:00
Swag McYolosteinen
06fb97b332 Merge pull request #4648 from Firecage/mineralfloors 
Mineral floors
 2014-09-06 17:23:29 +02:00
Firecage
4665e95142 Miauw is annoying 2014-09-06 17:01:45 +02:00
Firecage
a260e70d2b istypeing 2014-09-06 16:49:03 +02:00
Firecage
c45ddeb365 miauw is weird 2014-09-06 16:28:38 +02:00
Firecage
aab99e8825 Fixes what Miauw said 2014-09-06 15:19:58 +02:00
Swag McYolosteinen
209aa859aa Merge pull request #4593 from Firecage/orangeshoescuffs 
No longer can you make shoecuffs with cable cuffs
 2014-09-06 12:16:38 +02:00
Swag McYolosteinen
6fc761ab49 Merge pull request #4401 from Lo6a4evskiy/Multiple_holograms 
Multiple AIs can use single holopad
 2014-09-06 11:51:26 +02:00
Lo6a4evskiy
82f869c9a6 Updated to resolve conflicts 2014-09-06 13:34:43 +04:00
ikarrus
33467c8a06 clarification in comments 2014-09-05 22:58:58 -06:00
ikarrus
bae6578055 Config Option to Bar Lizards from Authority Roles 
aka formalizing Human Supremacy

- Adds a config option ENFORCE_HUMAN_AUTHORITY which prevents lizard players from joining Command and Security roles

[Lizard subjugation intensifies]
 2014-09-05 22:44:05 -06:00
ikarrus
668db29868 Added some <BR>s to Minor Announcements 
- Makes them look nicer with the title on it's own line
- Makes them a bit more noticeable
 2014-09-05 20:58:43 -06:00
ikarrus
4ace65b90e Securitrons will only arrest unidentifiable persons when ID check is on 
- Sec bots will check if the person is "Unknown" and without an ID if idcheck is on. This means beepsky will stop targetting people at the HoP line, or officers changing his settings. It's meant to target disguised people, as I had originally intended.
- However, sec bots, unable to identify monkeys, will start arresting them if idcheck is on
- Agent IDs buffed to reduce threat level by 5 instead of 2
 2014-09-05 20:40:09 -06:00
Lo6a4evskiy
92608c4a05 Updated comment 2014-09-06 00:02:19 +04:00