cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-10 01:22:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,670 Commits 26 Branches 2 Tags
2159409d53dc55fd7b52b4e4e5fa99409889f540
Commit Graph

1378 Commits

Author SHA1 Message Date
Miniature
2159409d53 Merge branch 'master' of git://github.com/Baystation12/Baystation12 
Conflicts:
	code/game/vote.dm

Because I did it derpily.
 2011-12-03 19:30:28 +10:30
Miniature
f62eccc76b Merge branch 'master' of git://github.com/Abi79/tgstation13-git 
Conflicts:
	baystation12.dme
	code/defines/mob/mob.dm
	code/defines/obj/vending.dm
	code/game/atom_procs.dm
	code/game/dna.dm
	code/game/machinery/computer/aifixer.dm
	code/game/vote.dm
	code/modules/chemical/Chemistry-Machinery.dm
	code/modules/chemical/Chemistry-Reagents.dm
	code/modules/mob/living/carbon/metroid/life.dm
	html/changelog.html
	icons/obj/stationobjs.dmi
	interface/skin.dmf
	maps/tgstation.2.0.8.dmm
 2011-12-03 19:28:10 +10:30
Tastyfish
8c596e5c53 added sleeping on logout, willful sleeping, custom event message, slots 2011-12-02 17:28:24 -05:00
CompactNinja
79e8ad760b AI icon stuff from old code. Also fixed some of Mini's derping. 
Signed-off-by: CompactNinja <kulzernite@hotmail.com>
 2011-12-02 21:18:29 +10:30
Miniature
e1a254c34f Fixed a silly, and no mode votes while round is in progress, more .gitignore (*.lk, info.json) 2011-12-02 15:47:42 +10:30
petethegoat@gmail.com
a80e46c078 Fixed issue 222. 
Improved closet/secure closet/crate code a bit. (Updated the paths on the map.)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2585 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-01 20:02:43 +00:00
LastBattaWolf@hotmail.com
29a3acab5c quickfix to make ambimalf play less often 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2584 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-01 09:37:47 +00:00
headswe
e86db35be0 Merge pull request #50 from Tastyfish/master 
Nanotrasen laws, nobody likes you asimov
 2011-11-30 18:37:45 -08:00
Tastyfish
0b28c04e8c Nanotrasen laws, nobody likes you asimov 2011-11-30 19:23:37 -05:00
headswe
5cdbb88c03 Merge pull request #48 from Miniature/master 
Made security able to be traitors (AI and cyborg still can't)
 2011-11-30 16:07:01 -08:00
headswe
41346a6828 Merge pull request #49 from Tastyfish/master 
Added vending charges, removed clown/mime from main joblist, sec belts
 2011-11-30 16:06:38 -08:00
Tastyfish
b344e2a442 Merge remote-tracking branch 'upstream/master' 2011-11-30 18:35:58 -05:00
Tastyfish
26e1bfdaf1 Added vending charges, removed clown/mime from main joblist, sec belts fixed 2011-11-30 18:34:43 -05:00
LastBattaWolf@hotmail.com
af1041f4b7 Added some more ambiance 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2583 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-11-30 23:24:13 +00:00
Miniature
363b929216 Made security able to be traitors (AI and cyborg still can't) 2011-12-01 07:52:40 +10:30
petethegoat@gmail.com
514d4e15d9 Cryotubes & freezers work from any direction. 
Mappers, make sure the direction is set correctly!

Updated the map so the existing freezers ain't broke.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2582 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-11-30 17:05:56 +00:00
Head
789dded1bf Merge branch 'master' of github.com:Baystation12/Baystation12 2011-11-30 17:51:03 +01:00
Head
73b9b7a481 Just a minor modification to the topic.dm 2011-11-30 17:49:35 +01:00
petethegoat@gmail.com
80607987da Quick fix to stop gamemode votes restarting the world if they finish before round start. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2581 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-11-30 16:01:22 +00:00
petethegoat@gmail.com
85cb13fe95 Reverted the janitor closet to the old trashbag. (It does work, I fixed it up in r2557.) 
A bunch of fixes for various stuff that's been broken about the bag of holding. It should work as intended, now.
Made wet floor signs fit in boxes.
Cleaned up the janitor's closet a bit.
Optimised the vault wiring a bit.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2580 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-11-30 15:02:01 +00:00
ryantennessee@yahoo.com
2883e40c19 Added additional transfer amount options to the medborg's inoprov and anti-tox vials. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2579 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-11-30 06:49:40 +00:00
kortgstation@gmail.com
763c0ecf71 Can now make light tubes/bulbs in the autolathe 
Old trashbag was buggy as fuck and useless. Didn't touch it's code, but replaced it's spawn in the janitors locker with a 20 slot, tiny item only storage object (new trashbag)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2577 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-11-30 05:35:40 +00:00
headswe
f426d9b5df Merge pull request #42 from Miniature/master 
Arrivals scanner
 2011-11-29 09:25:09 -08:00
Head
e1df14b5c1 Forgot to call makejson() 2011-11-29 18:15:49 +01:00
Miniature
1c01524055 Arrivals scanner stuff, now has sprite, new name, and uses power 
Just needs jobban stuff, then should be fine to add to a map
 2011-11-30 01:19:41 +10:30
Head
43d71282e0 Added back json support / restart notice 
should fix unnecessary restart after gamemode change before round start
 2011-11-29 15:45:01 +01:00
Miniature
d4ae76820b Fixedish the arrivals scanner, still need to add circuitboard to it 2011-11-29 22:57:57 +10:30
Miniature
fbf18ddd7e Arrivals scanner 2011-11-29 22:57:35 +10:30
Miniature
0e129ba6ce No more random end sounds 2011-11-29 22:50:29 +10:30
CompactNinja
f003685c57 Commented out talking vending machines, as they are fucking annoying. 
Signed-off-by: CompactNinja <kulzernite@hotmail.com>
 2011-11-29 16:49:09 +10:30
Tastyfish
e89488975f we work for NanoTrasen! Also, we don't have enough people for your fancy 
15-person minimums
 2011-11-29 00:19:37 -05:00
trubblebass@gmail.com
c04733113c - Readded the map from r2571 
- Fixed the runtime caused in r2558
- As a result Autolathe can no longer make APC parts, wires or bulbs.

Coderbus spent the best part of an evening chasing down this runtime.
We are not amused.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2573 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-11-29 01:18:35 +00:00
petethegoat@gmail.com
1cd49a6f13 Replacing monkie with monkey... 
Replaced 11 strings in 8 files

Shout at me if this breaks anything.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2569 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-11-28 19:39:22 +00:00
petethegoat@gmail.com
986858f761 Fix for Ripley tele-drilling people that had run away. 
Fix for mediborgs inserting their beaker into the chem dispenser. (this broke everything)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2568 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-11-28 19:34:08 +00:00
vageyenaman@gmail.com
1d255c8f8e Changelings can no longer have their DNA modified at all through any means (except adminfuckery perhaps). Sorry, you can't clone changelings now through UI+SE abuse! Borg them instead. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2566 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-11-28 03:41:45 +00:00
kortgstation@gmail.com
e3d8fe0b78 Husks can be borged again (if traitors have to hide bodies to avoid being tattled on by a clone, changelings can deal with it as well. You can change faces as well if you'e really worried about being caught) 
Changeling genome requirement lowered from 8-12 to 6-12 (APPROVED BY MUSKETS COME AT ME URIST)

Regen stasis now heals cloneloss (in case you suffer a metroid accident)

Added a "summon creature swarm" spell for later use in cult.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2565 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-11-27 23:25:56 +00:00
vageyenaman@gmail.com
25f8e20822 New adminshit. A verb that lets admins force players to have completely random identities when they join/latejoin. Only works before rounds. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2564 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-11-27 21:51:39 +00:00
uhangi@gmail.com
48bd33c65e Fixed a bug where you could conceal things in PDAs. 
..really sad I can't abuse this.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2563 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-11-27 13:36:51 +00:00
vageyenaman@gmail.com
3babc3a7fb Magnets now generate path lists upon constructor New() being called if they have a default path. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2561 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-11-26 18:57:26 +00:00
petethegoat@gmail.com
edf76efd86 Fixed issue 205. 
Cyborgs can now just walk into recharging stations.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2560 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-11-26 18:16:10 +00:00
tronaldnwn@hotmail.com
9038cfdda7 Food: 
Cream pies splat when thrown.
Chaos donuts more chaotic (reduced amount of reagents need to make)
Mystery stew more mysterious (Changed recipe)
Wish Soup some times grants your hungry belly's prayers (new icon).
Meat pie recipes condensed.
Grilled cheese sandwiches
Some reagent amounts may have changed as a result of me seeing them not match the amount of reagent put into making them.
Terribad food descriptions added or modified.


Autolathe has light bulbs, APC parts, and wires in the creation list!

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2558 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-11-26 16:09:34 +00:00
petethegoat@gmail.com
2190408f0f Massively improved trashbags. PICK UP EVERYTHING! Fixed issue 209. 
Slightly improved mops, and got rid of the "X attacks the blood with the mop!" message.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2557 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-11-26 15:58:50 +00:00
rockdtben
1de1be054d Implemented more getters/setters for damage system. 2 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2556 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-11-26 13:33:18 +00:00
rockdtben
9aecc4286b Implemented more getters/setters for damage system. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2555 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-11-26 12:58:15 +00:00
Albert Iordache
4a4353e1fc Commented out some more forum-sql related code 2011-11-24 13:41:20 +02:00
Baystation12
c1cc954e94 Merge pull request #22 from Tastyfish/master 
Merged tg's and bay12's paper code, and closed a possible exploit.
 2011-11-24 03:21:07 -08:00
Tastyfish
cc14ed34a5 Merged best of tg's and bay12's paper code, and closed a possible exploit 2011-11-23 23:09:18 -05:00
vageyenaman@gmail.com
fd67a22afd Final fixes for the firing range. This SHOULD be the last of them. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2550 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-11-24 00:29:36 +00:00
vageyenaman@gmail.com
d719cadf3e Ok for reals this time, removes unnecessary debugging messages. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2548 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-11-23 21:45:11 +00:00
vageyenaman@gmail.com
0b1318997c Removes unnecessary debugging crap. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2547 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-11-23 21:30:28 +00:00